diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-16 04:38:58 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-16 04:38:58 +0100 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /include/asm-mn10300/uaccess.h | |
| parent | powerpc/85xx: Fix compile issues with mpc8572ds.dts (diff) | |
| parent | powerpc/cell/axon-msi: Fix MSI after kexec (diff) | |
| download | linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.xz linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'include/asm-mn10300/uaccess.h')
| -rw-r--r-- | include/asm-mn10300/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mn10300/uaccess.h b/include/asm-mn10300/uaccess.h index 46b9b647f3c3..8a3a4dd55763 100644 --- a/include/asm-mn10300/uaccess.h +++ b/include/asm-mn10300/uaccess.h @@ -266,7 +266,7 @@ extern int __get_user_unknown(void); " .section .fixup,\"ax\" \n" \ "4: \n" \ " mov %5,%0 \n" \ - " jmp 2b \n" \ + " jmp 3b \n" \ " .previous \n" \ " .section __ex_table,\"a\"\n" \ " .balign 4 \n" \ |