diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 15:48:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 15:48:29 -0700 |
| commit | 7fc22f45fef00b55d9517e340650b6a0368faff1 (patch) | |
| tree | a4e2102797c1f8eee6c3ab288db0bf774d9ccc42 /arch/sparc/lib/GENbzero.S | |
| parent | 50fb55d88c999b3c17f93357a009b04d22eda4f7 (diff) | |
| parent | 3c7f62212018b904ae17f5636ead18a4dca3a88f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"sparc changes, including a bug fix for handling exceptions during
bzero on some sparc64 cpus"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: fix fault handling in NGbzero.S and GENbzero.S
sparc: use memdup_user_nul in sun4m LED driver
sparc: Remove redundant tests in boot_flags_init().
Diffstat (limited to 'arch/sparc/lib/GENbzero.S')
| -rw-r--r-- | arch/sparc/lib/GENbzero.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/lib/GENbzero.S b/arch/sparc/lib/GENbzero.S index 8e7a843ddd88..2fbf6297d57c 100644 --- a/arch/sparc/lib/GENbzero.S +++ b/arch/sparc/lib/GENbzero.S @@ -8,7 +8,7 @@ 98: x,y; \ .section __ex_table,"a";\ .align 4; \ - .word 98b, __retl_o1; \ + .word 98b, __retl_o1_asi;\ .text; \ .align 4; |