s390/ctlreg: use local_ctl_load() and local_ctl_store() where possible

Convert all single control register usages of __local_ctl_load() and
__local_ctl_store() to local_ctl_load() and local_ctl_store().

This also requires to change the type of some struct lowcore members
from __u64 to unsigned long.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

12 files changed, 41 insertions, 41 deletions

diff --git a/arch/s390/boot/vmem.c b/arch/s390/boot/vmem.c
index 666fc4e50c1e..44278ae2512f 100644
--- a/arch/s390/boot/vmem.c
+++ b/arch/s390/boot/vmem.c
@@ -446,9 +446,9 @@ void setup_vmem(unsigned long asce_limit)
 	S390_lowcore.kernel_asce = swapper_pg_dir | asce_bits;
 	S390_lowcore.user_asce = s390_invalid_asce;
 
-	__local_ctl_load(S390_lowcore.kernel_asce, 1, 1);
-	__local_ctl_load(S390_lowcore.user_asce, 7, 7);
-	__local_ctl_load(S390_lowcore.kernel_asce, 13, 13);
+	local_ctl_load(1, &S390_lowcore.kernel_asce);
+	local_ctl_load(7, &S390_lowcore.user_asce);
+	local_ctl_load(13, &S390_lowcore.kernel_asce);
 
 	init_mm.context.asce = S390_lowcore.kernel_asce;
 }
diff --git a/arch/s390/include/asm/ctlreg.h b/arch/s390/include/asm/ctlreg.h
index e8e5aef08bfd..86887b490bb5 100644
--- a/arch/s390/include/asm/ctlreg.h
+++ b/arch/s390/include/asm/ctlreg.h
@@ -90,18 +90,18 @@ static __always_inline void local_ctl_set_bit(unsigned int cr, unsigned int bit)
 {
 	unsigned long reg;
 
-	__local_ctl_store(reg, cr, cr);
+	local_ctl_store(cr, &reg);
 	reg |= 1UL << bit;
-	__local_ctl_load(reg, cr, cr);
+	local_ctl_load(cr, &reg);
 }
 
 static __always_inline void local_ctl_clear_bit(unsigned int cr, unsigned int bit)
 {
 	unsigned long reg;
 
-	__local_ctl_store(reg, cr, cr);
+	local_ctl_store(cr, &reg);
 	reg &= ~(1UL << bit);
-	__local_ctl_load(reg, cr, cr);
+	local_ctl_load(cr, &reg);
 }
 
 void system_ctlreg_lock(void);
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 69ccc464a430..2174f00e188b 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -139,8 +139,8 @@ struct lowcore {
 	__u32	restart_flags;			/* 0x0384 */
 
 	/* Address space pointer. */
-	__u64	kernel_asce;			/* 0x0388 */
-	__u64	user_asce;			/* 0x0390 */
+	unsigned long kernel_asce;		/* 0x0388 */
+	unsigned long user_asce;		/* 0x0390 */
 
 	/*
 	 * The lpp and current_pid fields form a
@@ -199,7 +199,7 @@ struct lowcore {
 	__u32	clock_comp_save_area[2];	/* 0x1330 */
 	__u64	last_break_save_area;		/* 0x1338 */
 	__u32	access_regs_save_area[16];	/* 0x1340 */
-	__u64	cregs_save_area[16];		/* 0x1380 */
+	unsigned long cregs_save_area[16];	/* 0x1380 */
 	__u8	pad_0x1400[0x1500-0x1400];	/* 0x1400 */
 	/* Cryptography-counter designation */
 	__u64	ccd;				/* 0x1500 */
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index a72865fce0ad..0e93275f80f0 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -81,7 +81,7 @@ static inline void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *
 		S390_lowcore.user_asce = next->context.asce;
 	cpumask_set_cpu(cpu, &next->context.cpu_attach_mask);
 	/* Clear previous user-ASCE from CR7 */
-	__local_ctl_load(s390_invalid_asce, 7, 7);
+	local_ctl_load(7, &s390_invalid_asce);
 	if (prev != next)
 		cpumask_clear_cpu(cpu, &prev->context.cpu_attach_mask);
 }
@@ -111,7 +111,7 @@ static inline void finish_arch_post_lock_switch(void)
 		__tlb_flush_mm_lazy(mm);
 		preempt_enable();
 	}
-	__local_ctl_load(S390_lowcore.user_asce, 7, 7);
+	local_ctl_load(7, &S390_lowcore.user_asce);
 }
 
 #define activate_mm activate_mm
@@ -120,7 +120,7 @@ static inline void activate_mm(struct mm_struct *prev,
 {
 	switch_mm(prev, next, current);
 	cpumask_set_cpu(smp_processor_id(), mm_cpumask(next));
-	__local_ctl_load(S390_lowcore.user_asce, 7, 7);
+	local_ctl_load(7, &S390_lowcore.user_asce);
 }
 
 #include <asm-generic/mmu_context.h>
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 07152e74afb1..fe9d65060fa4 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -94,12 +94,12 @@ static noinline void __machine_kdump(void *image)
 	if (MACHINE_HAS_VX)
 		save_vx_regs((__vector128 *) mcesa->vector_save_area);
 	if (MACHINE_HAS_GS) {
-		__local_ctl_store(cr2_old.val, 2, 2);
+		local_ctl_store(2, &cr2_old.val);
 		cr2_new = cr2_old;
 		cr2_new.gse = 1;
-		__local_ctl_load(cr2_new.val, 2, 2);
+		local_ctl_load(2, &cr2_new.val);
 		save_gs_cb((struct gs_cb *) mcesa->guarded_storage_save_area);
-		__local_ctl_load(cr2_old.val, 2, 2);
+		local_ctl_load(2, &cr2_old.val);
 	}
 	/*
 	 * To create a good backchain for this CPU in the dump store_status
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 927bd83ac9c0..7880a42896a3 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -131,10 +131,10 @@ static notrace void s390_handle_damage(void)
 	 * Disable low address protection and make machine check new PSW a
 	 * disabled wait PSW. Any additional machine check cannot be handled.
 	 */
-	__local_ctl_store(cr0.val, 0, 0);
+	local_ctl_store(0, &cr0.val);
 	cr0_new = cr0;
 	cr0_new.lap = 0;
-	__local_ctl_load(cr0_new.val, 0, 0);
+	local_ctl_load(0, &cr0_new.val);
 	psw_save = S390_lowcore.mcck_new_psw;
 	psw_bits(S390_lowcore.mcck_new_psw).io = 0;
 	psw_bits(S390_lowcore.mcck_new_psw).ext = 0;
@@ -146,7 +146,7 @@ static notrace void s390_handle_damage(void)
 	 * values. This makes possible system dump analysis easier.
 	 */
 	S390_lowcore.mcck_new_psw = psw_save;
-	__local_ctl_load(cr0.val, 0, 0);
+	local_ctl_load(0, &cr0.val);
 	disabled_wait();
 	while (1);
 }
@@ -271,7 +271,7 @@ static int notrace s390_validate_registers(union mci mci)
 			kill_task = 1;
 		cr0.val = S390_lowcore.cregs_save_area[0];
 		cr0.afp = cr0.vx = 1;
-		__local_ctl_load(cr0.val, 0, 0);
+		local_ctl_load(0, &cr0.val);
 		asm volatile(
 			"	la	1,%0\n"
 			"	VLM	0,15,0,1\n"
@@ -279,7 +279,7 @@ static int notrace s390_validate_registers(union mci mci)
 			:
 			: "Q" (*(struct vx_array *)mcesa->vector_save_area)
 			: "1");
-		__local_ctl_load(S390_lowcore.cregs_save_area[0], 0, 0);
+		local_ctl_load(0, &S390_lowcore.cregs_save_area[0]);
 	}
 	/* Validate access registers */
 	asm volatile(
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 1824c1208852..a1fb4536784f 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -46,8 +46,8 @@ void update_cr_regs(struct task_struct *task)
 	union ctlreg2 cr2_old, cr2_new;
 	int cr0_changed, cr2_changed;
 
-	__local_ctl_store(cr0_old.val, 0, 0);
-	__local_ctl_store(cr2_old.val, 2, 2);
+	local_ctl_store(0, &cr0_old.val);
+	local_ctl_store(2, &cr2_old.val);
 	cr0_new = cr0_old;
 	cr2_new = cr2_old;
 	/* Take care of the enable/disable of transactional execution. */
@@ -75,9 +75,9 @@ void update_cr_regs(struct task_struct *task)
 	cr0_changed = cr0_new.val != cr0_old.val;
 	cr2_changed = cr2_new.val != cr2_old.val;
 	if (cr0_changed)
-		__local_ctl_load(cr0_new.val, 0, 0);
+		local_ctl_load(0, &cr0_new.val);
 	if (cr2_changed)
-		__local_ctl_load(cr2_new.val, 2, 2);
+		local_ctl_load(2, &cr2_new.val);
 	/* Copy user specified PER registers */
 	new.control = thread->per_user.control;
 	new.start = thread->per_user.start;
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index c516e2e909e6..48a456a10206 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -791,15 +791,15 @@ static void __init setup_cr(void)
 	__ctl_duct[4] = (unsigned long)__ctl_duald;
 
 	/* Update control registers CR2, CR5 and CR15 */
-	__local_ctl_store(cr2.val, 2, 2);
-	__local_ctl_store(cr5.val, 5, 5);
-	__local_ctl_store(cr15.val, 15, 15);
+	local_ctl_store(2, &cr2.val);
+	local_ctl_store(5, &cr5.val);
+	local_ctl_store(15, &cr15.val);
 	cr2.ducto = (unsigned long)__ctl_duct >> 6;
 	cr5.pasteo = (unsigned long)__ctl_duct >> 6;
 	cr15.lsea = (unsigned long)__ctl_linkage_stack >> 3;
-	__local_ctl_load(cr2.val, 2, 2);
-	__local_ctl_load(cr5.val, 5, 5);
-	__local_ctl_load(cr15.val, 15, 15);
+	local_ctl_load(2, &cr2.val);
+	local_ctl_load(5, &cr5.val);
+	local_ctl_load(15, &cr15.val);
 }
 
 /*
diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c
index 551de5394be6..56f7eb90b44d 100644
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@ -19,13 +19,13 @@ void debug_user_asce(int exit)
 {
 	unsigned long cr1, cr7;
 
-	__local_ctl_store(cr1, 1, 1);
-	__local_ctl_store(cr7, 7, 7);
+	local_ctl_store(1, &cr1);
+	local_ctl_store(7, &cr7);
 	if (cr1 == S390_lowcore.kernel_asce && cr7 == S390_lowcore.user_asce)
 		return;
 	panic("incorrect ASCE on kernel %s\n"
 	      "cr1:    %016lx cr7:  %016lx\n"
-	      "kernel: %016llx user: %016llx\n",
+	      "kernel: %016lx user: %016lx\n",
 	      exit ? "exit" : "entry", cr1, cr7,
 	      S390_lowcore.kernel_asce, S390_lowcore.user_asce);
 }
diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index 43bef9cce9b2..27720a687022 100644
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -63,7 +63,7 @@ static void __crst_table_upgrade(void *arg)
 	/* change all active ASCEs to avoid the creation of new TLBs */
 	if (current->active_mm == mm) {
 		S390_lowcore.user_asce = mm->context.asce;
-		__local_ctl_load(S390_lowcore.user_asce, 7, 7);
+		local_ctl_load(7, &S390_lowcore.user_asce);
 	}
 	__tlb_flush_local();
 }
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 1ebc60d9cedc..30a7cd9748fe 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -732,10 +732,10 @@ sclp_sync_wait(void)
 	/* Enable service-signal interruption, disable timer interrupts */
 	old_tick = local_tick_disable();
 	trace_hardirqs_on();
-	__local_ctl_store(cr0, 0, 0);
+	local_ctl_store(0, &cr0);
 	cr0_sync = cr0 & ~CR0_IRQ_SUBCLASS_MASK;
 	cr0_sync |= 1UL << (63 - 54);
-	__local_ctl_load(cr0_sync, 0, 0);
+	local_ctl_load(0, &cr0_sync);
 	__arch_local_irq_stosm(0x01);
 	/* Loop until driver state indicates finished request */
 	while (sclp_running_state != sclp_running_state_idle) {
@@ -745,7 +745,7 @@ sclp_sync_wait(void)
 		cpu_relax();
 	}
 	local_irq_disable();
-	__local_ctl_load(cr0, 0, 0);
+	local_ctl_load(0, &cr0);
 	if (!irq_context)
 		_local_bh_enable();
 	local_tick_enable(old_tick);
diff --git a/drivers/s390/char/sclp_early_core.c b/drivers/s390/char/sclp_early_core.c
index fa5b7d63a254..8cb9fb7098e2 100644
--- a/drivers/s390/char/sclp_early_core.c
+++ b/drivers/s390/char/sclp_early_core.c
@@ -32,11 +32,11 @@ void sclp_early_wait_irq(void)
 	psw_t psw_ext_save, psw_wait;
 	union ctlreg0 cr0, cr0_new;
 
-	__local_ctl_store(cr0.val, 0, 0);
+	local_ctl_store(0, &cr0.val);
 	cr0_new.val = cr0.val & ~CR0_IRQ_SUBCLASS_MASK;
 	cr0_new.lap = 0;
 	cr0_new.sssm = 1;
-	__local_ctl_load(cr0_new.val, 0, 0);
+	local_ctl_load(0, &cr0_new.val);
 
 	psw_ext_save = S390_lowcore.external_new_psw;
 	psw_mask = __extract_psw();
@@ -59,7 +59,7 @@ void sclp_early_wait_irq(void)
 	} while (S390_lowcore.ext_int_code != EXT_IRQ_SERVICE_SIG);
 
 	S390_lowcore.external_new_psw = psw_ext_save;
-	__local_ctl_load(cr0.val, 0, 0);
+	local_ctl_load(0, &cr0.val);
 }
 
 int sclp_early_cmd(sclp_cmdw_t cmd, void *sccb)