summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-14 10:41:39 +0200
committerDavid S. Miller <davem@davemloft.net>2008-08-14 10:41:39 +0200
commitc918dcce92f76bb9903e4d049f4780bad384c207 (patch)
tree98cba34aec05883f1c25aa19c2a8600e4a588341
parentsparc64: Handle stack trace attempts before irqstacks are setup. (diff)
downloadlinux-c918dcce92f76bb9903e4d049f4780bad384c207.tar.xz
linux-c918dcce92f76bb9903e4d049f4780bad384c207.zip
sparc64: Fix overshoot in nid_range().
If 'start' does not begin on a page boundary, we can overshoot past 'end'. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/mm/init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 217de3ea29e8..64d8e7623e0d 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -796,6 +796,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end,
start += PAGE_SIZE;
}
+ if (start > end)
+ start = end;
+
return start;
}
#else