diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-03 04:50:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-03 04:50:27 +0100 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /arch/sparc64/lib/user_fixup.c | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rus... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| download | linux-aa2ba5f1082dc705745899584aac8416d710c056.tar.xz linux-aa2ba5f1082dc705745899584aac8416d710c056.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'arch/sparc64/lib/user_fixup.c')
| -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 if (fault_addr < start || fault_addr >= end) { *offset = 0; } else { - *offset = start - fault_addr; + *offset = fault_addr - start; size = end - fault_addr; } return size; |