|
@@ -68,7 +68,6 @@ static inline int pte_file(pte_t pte) { return 0; }
|
|
|
|
|
|
extern unsigned long va_to_phys(unsigned long address);
|
|
|
extern pte_t *va_to_pte(unsigned long address);
|
|
|
-extern unsigned long ioremap_bot, ioremap_base;
|
|
|
|
|
|
/*
|
|
|
* The following only work if pte_present() is true.
|
|
@@ -411,7 +410,7 @@ static inline unsigned long pte_update(pte_t *p, unsigned long clr,
|
|
|
mts rmsr, %2\n\
|
|
|
nop"
|
|
|
: "=&r" (old), "=&r" (tmp), "=&r" (msr), "=m" (*p)
|
|
|
- : "r" ((unsigned long)(p+1) - 4), "r" (clr), "r" (set), "m" (*p)
|
|
|
+ : "r" ((unsigned long)(p + 1) - 4), "r" (clr), "r" (set), "m" (*p)
|
|
|
: "cc");
|
|
|
|
|
|
return old;
|
|
@@ -580,18 +579,11 @@ void mapin_ram(void);
|
|
|
int map_page(unsigned long va, phys_addr_t pa, int flags);
|
|
|
|
|
|
extern int mem_init_done;
|
|
|
-extern unsigned long ioremap_base;
|
|
|
-extern unsigned long ioremap_bot;
|
|
|
|
|
|
asmlinkage void __init mmu_init(void);
|
|
|
|
|
|
void __init *early_get_page(void);
|
|
|
|
|
|
-void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle);
|
|
|
-void consistent_free(void *vaddr);
|
|
|
-void consistent_sync(void *vaddr, size_t size, int direction);
|
|
|
-void consistent_sync_page(struct page *page, unsigned long offset,
|
|
|
- size_t size, int direction);
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
|
@@ -600,6 +592,14 @@ void consistent_sync_page(struct page *page, unsigned long offset,
|
|
|
#ifndef __ASSEMBLY__
|
|
|
#include <asm-generic/pgtable.h>
|
|
|
|
|
|
+extern unsigned long ioremap_bot, ioremap_base;
|
|
|
+
|
|
|
+void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle);
|
|
|
+void consistent_free(void *vaddr);
|
|
|
+void consistent_sync(void *vaddr, size_t size, int direction);
|
|
|
+void consistent_sync_page(struct page *page, unsigned long offset,
|
|
|
+ size_t size, int direction);
|
|
|
+
|
|
|
void setup_memory(void);
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|