s390: rename struct psw_bits members

[mirror_ubuntu-artful-kernel.git] / arch / s390 / kernel / uprobes.c

diff --git a/arch/s390/kernel/uprobes.c b/arch/s390/kernel/uprobes.c
index 314e0ee3016a343dd639bc9b2f8394879ed0ee41..d94baa8db507cc1cad8fdca9a04d74e8f3d1c8da 100644 (file)
--- a/arch/s390/kernel/uprobes.c
+++ b/arch/s390/kernel/uprobes.c
@@ -27,12 +27,12 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,
 
 int arch_uprobe_pre_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
 {
-       if (psw_bits(regs->psw).eaba == PSW_AMODE_24BIT)
+       if (psw_bits(regs->psw).eaba == PSW_BITS_AMODE_24BIT)
                return -EINVAL;
-       if (!is_compat_task() && psw_bits(regs->psw).eaba == PSW_AMODE_31BIT)
+       if (!is_compat_task() && psw_bits(regs->psw).eaba == PSW_BITS_AMODE_31BIT)
                return -EINVAL;
        clear_pt_regs_flag(regs, PIF_PER_TRAP);
-       auprobe->saved_per = psw_bits(regs->psw).r;
+       auprobe->saved_per = psw_bits(regs->psw).per;
        auprobe->saved_int_code = regs->int_code;
        regs->int_code = UPROBE_TRAP_NR;
        regs->psw.addr = current->utask->xol_vaddr;
@@ -81,7 +81,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
 
        clear_tsk_thread_flag(current, TIF_UPROBE_SINGLESTEP);
        update_cr_regs(current);
-       psw_bits(regs->psw).r = auprobe->saved_per;
+       psw_bits(regs->psw).per = auprobe->saved_per;
        regs->int_code = auprobe->saved_int_code;
 
        if (fixup & FIXUP_PSW_NORMAL)
@@ -372,8 +372,8 @@ static void handle_insn_ril(struct arch_uprobe *auprobe, struct pt_regs *regs)
 
 bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
 {
-       if ((psw_bits(regs->psw).eaba == PSW_AMODE_24BIT) ||
-           ((psw_bits(regs->psw).eaba == PSW_AMODE_31BIT) &&
+       if ((psw_bits(regs->psw).eaba == PSW_BITS_AMODE_24BIT) ||
+           ((psw_bits(regs->psw).eaba == PSW_BITS_AMODE_31BIT) &&
             !is_compat_task())) {
                regs->psw.addr = __rewind_psw(regs->psw, UPROBE_SWBP_INSN_SIZE);
                do_report_trap(regs, SIGILL, ILL_ILLADR, NULL);