diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 19:57:42 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 19:57:42 +0100 |
commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/sh/mm/numa.c | |
parent | x86: Use find_e820() instead of hard coded trampoline address (diff) | |
parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
download | linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.zip |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/sh/mm/numa.c')
-rw-r--r-- | arch/sh/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c index 9b784fdb947c..6c524446c0f6 100644 --- a/arch/sh/mm/numa.c +++ b/arch/sh/mm/numa.c @@ -60,7 +60,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) unsigned long bootmem_paddr; /* Don't allow bogus node assignment */ - BUG_ON(nid > MAX_NUMNODES || nid == 0); + BUG_ON(nid > MAX_NUMNODES || nid <= 0); start_pfn = start >> PAGE_SHIFT; end_pfn = end >> PAGE_SHIFT; |