diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 19:47:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 19:47:31 +1100 |
| commit | 2d10cdf2a52f741a13d43a962365763fcaceb448 (patch) | |
| tree | 470a13b8d72589e718d13bba1f80b996ed91b645 /arch/sparc64/kernel/cherrs.S | |
| parent | 65cd06d664c016f1c2862b5281d35752e81fdff5 (diff) | |
Revert "Merge commit 'sparc/master'"
This reverts commit 76e8e61b006cf2eb1149de6809cccc9aabe0ce62.
Diffstat (limited to 'arch/sparc64/kernel/cherrs.S')
| -rw-r--r-- | arch/sparc64/kernel/cherrs.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/cherrs.S b/arch/sparc64/kernel/cherrs.S index 4ee1ad420862..89afebd7eca0 100644 --- a/arch/sparc64/kernel/cherrs.S +++ b/arch/sparc64/kernel/cherrs.S @@ -102,7 +102,7 @@ cheetah_plus_dcpe_trap_vector: .type do_cheetah_plus_data_parity,#function do_cheetah_plus_data_parity: rdpr %pil, %g2 - wrpr %g0, PIL_NORMAL_MAX, %pil + wrpr %g0, 15, %pil ba,pt %xcc, etrap_irq rd %pc, %g7 #ifdef CONFIG_TRACE_IRQFLAGS @@ -144,7 +144,7 @@ cheetah_plus_icpe_trap_vector: .type do_cheetah_plus_insn_parity,#function do_cheetah_plus_insn_parity: rdpr %pil, %g2 - wrpr %g0, PIL_NORMAL_MAX, %pil + wrpr %g0, 15, %pil ba,pt %xcc, etrap_irq rd %pc, %g7 #ifdef CONFIG_TRACE_IRQFLAGS @@ -492,7 +492,7 @@ cheetah_fast_ecc: .type c_fast_ecc,#function c_fast_ecc: rdpr %pil, %g2 - wrpr %g0, PIL_NORMAL_MAX, %pil + wrpr %g0, 15, %pil ba,pt %xcc, etrap_irq rd %pc, %g7 #ifdef CONFIG_TRACE_IRQFLAGS @@ -528,7 +528,7 @@ cheetah_cee: .type c_cee,#function c_cee: rdpr %pil, %g2 - wrpr %g0, PIL_NORMAL_MAX, %pil + wrpr %g0, 15, %pil ba,pt %xcc, etrap_irq rd %pc, %g7 #ifdef CONFIG_TRACE_IRQFLAGS @@ -564,7 +564,7 @@ cheetah_deferred_trap: .type c_deferred,#function c_deferred: rdpr %pil, %g2 - wrpr %g0, PIL_NORMAL_MAX, %pil + wrpr %g0, 15, %pil ba,pt %xcc, etrap_irq rd %pc, %g7 #ifdef CONFIG_TRACE_IRQFLAGS |