diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 +0000 |
| commit | da63d20bfb12827dd7747a841ea27348af3abc0a (patch) | |
| tree | ba275a74d068f91b453c08b9bacf8afe9577db9b /arch/sparc/kernel/winfixup.S | |
| parent | 55020c8056a83ef2181e4cddd39cb2b9f4b88c5a (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | blackbird-obmc-linux-da63d20bfb12827dd7747a841ea27348af3abc0a.tar.gz blackbird-obmc-linux-da63d20bfb12827dd7747a841ea27348af3abc0a.zip | |
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
Diffstat (limited to 'arch/sparc/kernel/winfixup.S')
| -rw-r--r-- | arch/sparc/kernel/winfixup.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/winfixup.S b/arch/sparc/kernel/winfixup.S index a6b0863c27df..1e67ce958369 100644 --- a/arch/sparc/kernel/winfixup.S +++ b/arch/sparc/kernel/winfixup.S @@ -43,6 +43,8 @@ spill_fixup_mna: spill_fixup_dax: TRAP_LOAD_THREAD_REG(%g6, %g1) ldx [%g6 + TI_FLAGS], %g1 + andcc %sp, 0x1, %g0 + movne %icc, 0, %g1 andcc %g1, _TIF_32BIT, %g0 ldub [%g6 + TI_WSAVED], %g1 sll %g1, 3, %g3 |
