evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse source
This commit is contained in:
Linus Torvalds 2005-06-23 17:27:24 -07:00
commit 16822e6205
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/asm-ia64/mmzone.h
View file

@ -15,6 +15,8 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/meminit.h> #include <asm/meminit.h>
#ifdef CONFIG_DISCONTIGMEM
static inline int pfn_to_nid(unsigned long pfn) static inline int pfn_to_nid(unsigned long pfn)
{ {
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
@ -29,8 +31,6 @@ static inline int pfn_to_nid(unsigned long pfn)
#endif #endif
} }
#ifdef CONFIG_DISCONTIGMEM
#ifdef CONFIG_IA64_DIG /* DIG systems are small */ #ifdef CONFIG_IA64_DIG /* DIG systems are small */
# define MAX_PHYSNODE_ID 8 # define MAX_PHYSNODE_ID 8
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 8) # define NR_NODE_MEMBLKS (MAX_NUMNODES * 8)