diff options
author | Michal Simek <monstr@monstr.eu> | 2010-01-20 09:17:08 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-03-11 08:16:17 -0500 |
commit | 79bf3a137617e6deeac411c39f1660b7e91d6348 (patch) | |
tree | d4f7789d79e17af51774264c9e65b26875144f84 /arch/microblaze/include/asm | |
parent | 1be53e084a5bd8f59850348e1066d25aa0200031 (diff) |
microblaze: PCI early support for noMMU system
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/include/asm')
-rw-r--r-- | arch/microblaze/include/asm/pgalloc.h | 2 | ||||
-rw-r--r-- | arch/microblaze/include/asm/pgtable.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/pgalloc.h b/arch/microblaze/include/asm/pgalloc.h index 7547f5064560..f44b0d696fe2 100644 --- a/arch/microblaze/include/asm/pgalloc.h +++ b/arch/microblaze/include/asm/pgalloc.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
20 | #include <asm/page.h> | 20 | #include <asm/page.h> |
21 | #include <asm/cache.h> | 21 | #include <asm/cache.h> |
22 | #include <asm/pgtable.h> | ||
22 | 23 | ||
23 | #define PGDIR_ORDER 0 | 24 | #define PGDIR_ORDER 0 |
24 | 25 | ||
@@ -111,7 +112,6 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, | |||
111 | unsigned long address) | 112 | unsigned long address) |
112 | { | 113 | { |
113 | pte_t *pte; | 114 | pte_t *pte; |
114 | extern int mem_init_done; | ||
115 | extern void *early_get_page(void); | 115 | extern void *early_get_page(void); |
116 | if (mem_init_done) { | 116 | if (mem_init_done) { |
117 | pte = (pte_t *)__get_free_page(GFP_KERNEL | | 117 | pte = (pte_t *)__get_free_page(GFP_KERNEL | |
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index adcc3320e52a..dd2bb60651c7 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h | |||
@@ -16,6 +16,10 @@ | |||
16 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | 16 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ |
17 | remap_pfn_range(vma, vaddr, pfn, size, prot) | 17 | remap_pfn_range(vma, vaddr, pfn, size, prot) |
18 | 18 | ||
19 | #ifndef __ASSEMBLY__ | ||
20 | extern int mem_init_done; | ||
21 | #endif | ||
22 | |||
19 | #ifndef CONFIG_MMU | 23 | #ifndef CONFIG_MMU |
20 | 24 | ||
21 | #define pgd_present(pgd) (1) /* pages are always present on non MMU */ | 25 | #define pgd_present(pgd) (1) /* pages are always present on non MMU */ |
@@ -51,6 +55,8 @@ static inline int pte_file(pte_t pte) { return 0; } | |||
51 | 55 | ||
52 | #define arch_enter_lazy_cpu_mode() do {} while (0) | 56 | #define arch_enter_lazy_cpu_mode() do {} while (0) |
53 | 57 | ||
58 | #define pgprot_noncached_wc(prot) prot | ||
59 | |||
54 | #else /* CONFIG_MMU */ | 60 | #else /* CONFIG_MMU */ |
55 | 61 | ||
56 | #include <asm-generic/4level-fixup.h> | 62 | #include <asm-generic/4level-fixup.h> |