aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/mmzone.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-13 17:48:05 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-05-13 17:48:05 +0900
commitef4ed97d6bd91aa41907181e80a7feaf2721719a (patch)
treeadc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/include/asm/mmzone.h
parentMerge branch 'sh/clkfwk' (diff)
parentsh: Ensure active regions have a backing PMB entry. (diff)
downloadlinux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.tar.xz
linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.zip
Merge branch 'sh/lmb'
Conflicts: arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/include/asm/mmzone.h')
-rw-r--r--arch/sh/include/asm/mmzone.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/include/asm/mmzone.h b/arch/sh/include/asm/mmzone.h
index 7f5363b29ba0..8887baff5eff 100644
--- a/arch/sh/include/asm/mmzone.h
+++ b/arch/sh/include/asm/mmzone.h
@@ -42,9 +42,10 @@ setup_bootmem_node(int nid, unsigned long start, unsigned long end)
void __init plat_mem_setup(void);
/* arch/sh/kernel/setup.c */
-void __init setup_bootmem_allocator(unsigned long start_pfn);
void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
unsigned long end_pfn);
+/* arch/sh/mm/init.c */
+void __init allocate_pgdat(unsigned int nid);
#endif /* __KERNEL__ */
#endif /* __ASM_SH_MMZONE_H */