aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-02 15:55:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-02 15:55:43 -0800
commite6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13 (patch)
tree04435004a39c68d335557bbe77f06153cdf9d709 /arch
parente1825e7515010053e44287e6e78f9078cd1916a9 (diff)
parentb270ee8a9fc9547eb781ce9ccd379450bcf9a204 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix offset calculation in compute_size() rtc: rtc-starfire fixes
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/lib/user_fixup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/lib/user_fixup.c b/arch/sparc64/lib/user_fixup.c
index 19d1fdb17d0..05a361b0a1a 100644
--- a/arch/sparc64/lib/user_fixup.c
+++ b/arch/sparc64/lib/user_fixup.c
@@ -24,7 +24,7 @@ static unsigned long compute_size(unsigned long start, unsigned long size, unsig
if (fault_addr < start || fault_addr >= end) {
*offset = 0;
} else {
- *offset = start - fault_addr;
+ *offset = fault_addr - start;
size = end - fault_addr;
}
return size;