projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] PM: Fix SMP races in the freezer
[powerpc.git]
/
include
/
asm-ia64
/
mmzone.h
diff --git
a/include/asm-ia64/mmzone.h
b/include/asm-ia64/mmzone.h
index
d32f51e
..
34efe88
100644
(file)
--- a/
include/asm-ia64/mmzone.h
+++ b/
include/asm-ia64/mmzone.h
@@
-15,7
+15,7
@@
#include <asm/page.h>
#include <asm/meminit.h>
#include <asm/page.h>
#include <asm/meminit.h>
-#ifdef CONFIG_
DISCONTIGMEM
+#ifdef CONFIG_
NUMA
static inline int pfn_to_nid(unsigned long pfn)
{
static inline int pfn_to_nid(unsigned long pfn)
{
@@
-31,6
+31,10
@@
static inline int pfn_to_nid(unsigned long pfn)
#endif
}
#endif
}
+#ifdef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
+extern int early_pfn_to_nid(unsigned long pfn);
+#endif
+
#ifdef CONFIG_IA64_DIG /* DIG systems are small */
# define MAX_PHYSNODE_ID 8
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 8)
#ifdef CONFIG_IA64_DIG /* DIG systems are small */
# define MAX_PHYSNODE_ID 8
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 8)
@@
-39,8
+43,8
@@
static inline int pfn_to_nid(unsigned long pfn)
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4)
#endif
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4)
#endif
-#else /* CONFIG_
DISCONTIGMEM
*/
+#else /* CONFIG_
NUMA
*/
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4)
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4)
-#endif /* CONFIG_
DISCONTIGMEM
*/
+#endif /* CONFIG_
NUMA
*/
#endif /* _ASM_IA64_MMZONE_H */
#endif /* _ASM_IA64_MMZONE_H */