Skip to content

L
linux
Commit 16822e62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents a39451c1 e608a807
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/asm-ia64/mmzone.h
View file @ 16822e62
...@@ -15,6 +15,8 @@ ...@@ -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) ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7