aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/mm
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-01-20 15:17:08 +0100
committerMichal Simek <monstr@monstr.eu>2010-03-11 14:16:17 +0100
commit79bf3a137617e6deeac411c39f1660b7e91d6348 (patch)
treed4f7789d79e17af51774264c9e65b26875144f84 /arch/microblaze/mm
parent1be53e084a5bd8f59850348e1066d25aa0200031 (diff)
downloadkernel_samsung_crespo-79bf3a137617e6deeac411c39f1660b7e91d6348.zip
kernel_samsung_crespo-79bf3a137617e6deeac411c39f1660b7e91d6348.tar.gz
kernel_samsung_crespo-79bf3a137617e6deeac411c39f1660b7e91d6348.tar.bz2
microblaze: PCI early support for noMMU system
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/mm')
-rw-r--r--arch/microblaze/mm/init.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index aa6e163..1608e2e 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -23,6 +23,9 @@
#include <asm/sections.h>
#include <asm/tlb.h>
+/* Use for MMU and noMMU because of PCI generic code */
+int mem_init_done;
+
#ifndef CONFIG_MMU
unsigned int __page_offset;
EXPORT_SYMBOL(__page_offset);
@@ -30,7 +33,6 @@ EXPORT_SYMBOL(__page_offset);
#else
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-int mem_init_done;
static int init_bootmem_done;
#endif /* CONFIG_MMU */
@@ -202,9 +204,7 @@ void __init mem_init(void)
printk(KERN_INFO "Memory: %luk/%luk available\n",
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10));
-#ifdef CONFIG_MMU
mem_init_done = 1;
-#endif
}
#ifndef CONFIG_MMU
@@ -216,6 +216,10 @@ int ___range_ok(unsigned long addr, unsigned long size)
}
EXPORT_SYMBOL(___range_ok);
+int page_is_ram(unsigned long pfn)
+{
+ return __range_ok(pfn, 0);
+}
#else
int page_is_ram(unsigned long pfn)
{
@@ -344,6 +348,8 @@ void __init *early_get_page(void)
return p;
}
+#endif /* CONFIG_MMU */
+
void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
{
if (mem_init_done)
@@ -365,5 +371,3 @@ void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
}
return p;
}
-
-#endif /* CONFIG_MMU */