diff options
Diffstat (limited to 'arch/powerpc/kernel/align.c')
| -rw-r--r-- | arch/powerpc/kernel/align.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c index a5b632e52fae..3839839f83c7 100644 --- a/arch/powerpc/kernel/align.c +++ b/arch/powerpc/kernel/align.c | |||
| @@ -732,7 +732,7 @@ int fix_alignment(struct pt_regs *regs) | |||
| 732 | 732 | ||
| 733 | #ifdef CONFIG_SPE | 733 | #ifdef CONFIG_SPE |
| 734 | if ((instr >> 26) == 0x4) { | 734 | if ((instr >> 26) == 0x4) { |
| 735 | PPC_WARN_EMULATED(spe); | 735 | PPC_WARN_ALIGNMENT(spe, regs); |
| 736 | return emulate_spe(regs, reg, instr); | 736 | return emulate_spe(regs, reg, instr); |
| 737 | } | 737 | } |
| 738 | #endif | 738 | #endif |
| @@ -786,7 +786,7 @@ int fix_alignment(struct pt_regs *regs) | |||
| 786 | flags |= SPLT; | 786 | flags |= SPLT; |
| 787 | nb = 8; | 787 | nb = 8; |
| 788 | } | 788 | } |
| 789 | PPC_WARN_EMULATED(vsx); | 789 | PPC_WARN_ALIGNMENT(vsx, regs); |
| 790 | return emulate_vsx(addr, reg, areg, regs, flags, nb); | 790 | return emulate_vsx(addr, reg, areg, regs, flags, nb); |
| 791 | } | 791 | } |
| 792 | #endif | 792 | #endif |
| @@ -794,7 +794,7 @@ int fix_alignment(struct pt_regs *regs) | |||
| 794 | * the exception of DCBZ which is handled as a special case here | 794 | * the exception of DCBZ which is handled as a special case here |
| 795 | */ | 795 | */ |
| 796 | if (instr == DCBZ) { | 796 | if (instr == DCBZ) { |
| 797 | PPC_WARN_EMULATED(dcbz); | 797 | PPC_WARN_ALIGNMENT(dcbz, regs); |
| 798 | return emulate_dcbz(regs, addr); | 798 | return emulate_dcbz(regs, addr); |
| 799 | } | 799 | } |
| 800 | if (unlikely(nb == 0)) | 800 | if (unlikely(nb == 0)) |
| @@ -804,7 +804,7 @@ int fix_alignment(struct pt_regs *regs) | |||
| 804 | * function | 804 | * function |
| 805 | */ | 805 | */ |
| 806 | if (flags & M) { | 806 | if (flags & M) { |
| 807 | PPC_WARN_EMULATED(multiple); | 807 | PPC_WARN_ALIGNMENT(multiple, regs); |
| 808 | return emulate_multiple(regs, addr, reg, nb, | 808 | return emulate_multiple(regs, addr, reg, nb, |
| 809 | flags, instr, swiz); | 809 | flags, instr, swiz); |
| 810 | } | 810 | } |
| @@ -825,11 +825,11 @@ int fix_alignment(struct pt_regs *regs) | |||
| 825 | 825 | ||
| 826 | /* Special case for 16-byte FP loads and stores */ | 826 | /* Special case for 16-byte FP loads and stores */ |
| 827 | if (nb == 16) { | 827 | if (nb == 16) { |
| 828 | PPC_WARN_EMULATED(fp_pair); | 828 | PPC_WARN_ALIGNMENT(fp_pair, regs); |
| 829 | return emulate_fp_pair(addr, reg, flags); | 829 | return emulate_fp_pair(addr, reg, flags); |
| 830 | } | 830 | } |
| 831 | 831 | ||
| 832 | PPC_WARN_EMULATED(unaligned); | 832 | PPC_WARN_ALIGNMENT(unaligned, regs); |
| 833 | 833 | ||
| 834 | /* If we are loading, get the data from user space, else | 834 | /* If we are loading, get the data from user space, else |
| 835 | * get it from register values | 835 | * get it from register values |
