diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-08 15:47:12 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-08 15:47:12 +0900 |
| commit | 6424db52e24e8cdf89917fa3c10395116440160e (patch) | |
| tree | bd923d78f90addb080abc82f3bff6ca5c9bf10b4 /arch/sh/mm/numa.c | |
| parent | 09a072947791088b88ae15111cf68fc5aaaf758d (diff) | |
| parent | 6a5a0b9139b19dd1a107870269a35bc9cf18d2dc (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Conflict between FPU thread flag migration and debug
thread flag addition.
Conflicts:
arch/sh/include/asm/thread_info.h
arch/sh/include/asm/ubc.h
arch/sh/kernel/process_32.c
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; |