git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
mmzone.h
diff --git
a/arch/sh/include/asm/mmzone.h
b/arch/sh/include/asm/mmzone.h
index
2969253
..
8887baf
100644
(file)
--- a/
arch/sh/include/asm/mmzone.h
+++ b/
arch/sh/include/asm/mmzone.h
@@
-4,6
+4,8
@@
#ifdef __KERNEL__
#ifdef CONFIG_NEED_MULTIPLE_NODES
#ifdef __KERNEL__
#ifdef CONFIG_NEED_MULTIPLE_NODES
+#include <linux/numa.h>
+
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
@@
-40,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 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);
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 */
#endif /* __KERNEL__ */
#endif /* __ASM_SH_MMZONE_H */