diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 18:55:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 18:55:43 -0500 |
| commit | e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13 (patch) | |
| tree | 04435004a39c68d335557bbe77f06153cdf9d709 /arch/sparc64 | |
| parent | e1825e7515010053e44287e6e78f9078cd1916a9 (diff) | |
| parent | b270ee8a9fc9547eb781ce9ccd379450bcf9a204 (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/sparc64')
| -rw-r--r-- | arch/sparc64/lib/user_fixup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/lib/user_fixup.c b/arch/sparc64/lib/user_fixup.c index 19d1fdb17d0e..05a361b0a1a4 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 | |||
| 24 | if (fault_addr < start || fault_addr >= end) { | 24 | if (fault_addr < start || fault_addr >= end) { |
| 25 | *offset = 0; | 25 | *offset = 0; |
| 26 | } else { | 26 | } else { |
| 27 | *offset = start - fault_addr; | 27 | *offset = fault_addr - start; |
| 28 | size = end - fault_addr; | 28 | size = end - fault_addr; |
| 29 | } | 29 | } |
| 30 | return size; | 30 | return size; |