projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clocksource: fix resume logic
[powerpc.git]
/
include
/
linux
/
bootmem.h
diff --git
a/include/linux/bootmem.h
b/include/linux/bootmem.h
index
2275f27
..
0365ec9
100644
(file)
--- a/
include/linux/bootmem.h
+++ b/
include/linux/bootmem.h
@@
-108,7
+108,7
@@
static inline void *alloc_remap(int nid, unsigned long size)
#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
extern unsigned long __meminitdata nr_kernel_pages;
#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
extern unsigned long __meminitdata nr_kernel_pages;
-extern unsigned long nr_all_pages;
+extern unsigned long
__meminitdata
nr_all_pages;
extern void *alloc_large_system_hash(const char *tablename,
unsigned long bucketsize,
extern void *alloc_large_system_hash(const char *tablename,
unsigned long bucketsize,
@@
-122,9
+122,9
@@
extern void *alloc_large_system_hash(const char *tablename,
#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
/* Only NUMA needs hash distribution.
#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
/* Only NUMA needs hash distribution.
- * IA64
is known to
have sufficient vmalloc space.
+ * IA64
and x86_64
have sufficient vmalloc space.
*/
*/
-#if defined(CONFIG_NUMA) &&
defined(CONFIG_IA64
)
+#if defined(CONFIG_NUMA) &&
(defined(CONFIG_IA64) || defined(CONFIG_X86_64)
)
#define HASHDIST_DEFAULT 1
#else
#define HASHDIST_DEFAULT 0
#define HASHDIST_DEFAULT 1
#else
#define HASHDIST_DEFAULT 0