Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 305475
b: refs/heads/master
c: 3026169
h: refs/heads/master
i:
  305473: 10149f1
  305471: 9d7e205
v: v3
  • Loading branch information
Sam Ravnborg authored and Ingo Molnar committed Apr 14, 2012
1 parent 187ea19 commit 3d3949c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6fca40f1d7f3e232c9de27c1cebbb9f787fbc4f
refs/heads/master: 302616911da8e868d3f1a00dce517ca30b0e065d
4 changes: 0 additions & 4 deletions trunk/arch/x86/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1255,10 +1255,6 @@ config NODES_SHIFT
Specify the maximum number of NUMA Nodes available on the target
system. Increases memory reserved to accommodate various tables.

config HAVE_ARCH_BOOTMEM
def_bool y
depends on X86_32 && NUMA

config HAVE_ARCH_ALLOC_REMAP
def_bool y
depends on X86_32 && NUMA
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/x86/include/asm/mmzone_32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,4 @@ static inline int pfn_valid(int pfn)

#endif /* CONFIG_DISCONTIGMEM */

#ifdef CONFIG_NEED_MULTIPLE_NODES
/* always use node 0 for bootmem on this numa platform */
#define bootmem_arch_preferred_node(__bdata, size, align, goal, limit) \
(NODE_DATA(0)->bdata)
#endif /* CONFIG_NEED_MULTIPLE_NODES */

#endif /* _ASM_X86_MMZONE_32_H */

0 comments on commit 3d3949c

Please sign in to comment.