s390/maccess: rework absolute lowcore accessors

[linux-2.6-microblaze.git] / arch / s390 / kernel / setup.c

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 84e23fc..d860ac3 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -481,11 +481,11 @@ static void __init setup_lowcore_dat_off(void)
        lc->mcck_stack = mcck_stack + STACK_INIT_OFFSET;
 
        /* Setup absolute zero lowcore */
-       mem_assign_absolute(S390_lowcore.restart_stack, lc->restart_stack);
-       mem_assign_absolute(S390_lowcore.restart_fn, lc->restart_fn);
-       mem_assign_absolute(S390_lowcore.restart_data, lc->restart_data);
-       mem_assign_absolute(S390_lowcore.restart_source, lc->restart_source);
-       mem_assign_absolute(S390_lowcore.restart_psw, lc->restart_psw);
+       put_abs_lowcore(restart_stack, lc->restart_stack);
+       put_abs_lowcore(restart_fn, lc->restart_fn);
+       put_abs_lowcore(restart_data, lc->restart_data);
+       put_abs_lowcore(restart_source, lc->restart_source);
+       put_abs_lowcore(restart_psw, lc->restart_psw);
 
        lc->spinlock_lockval = arch_spin_lockval(0);
        lc->spinlock_index = 0;
@@ -501,6 +501,7 @@ static void __init setup_lowcore_dat_off(void)
 static void __init setup_lowcore_dat_on(void)
 {
        struct lowcore *lc = lowcore_ptr[0];
+       int cr;
 
        __ctl_clear_bit(0, 28);
        S390_lowcore.external_new_psw.mask |= PSW_MASK_DAT;
@@ -509,10 +510,10 @@ static void __init setup_lowcore_dat_on(void)
        S390_lowcore.io_new_psw.mask |= PSW_MASK_DAT;
        __ctl_store(S390_lowcore.cregs_save_area, 0, 15);
        __ctl_set_bit(0, 28);
-       mem_assign_absolute(S390_lowcore.restart_flags, RESTART_FLAG_CTLREGS);
-       mem_assign_absolute(S390_lowcore.program_new_psw, lc->program_new_psw);
-       memcpy_absolute(&S390_lowcore.cregs_save_area, lc->cregs_save_area,
-                       sizeof(S390_lowcore.cregs_save_area));
+       put_abs_lowcore(restart_flags, RESTART_FLAG_CTLREGS);
+       put_abs_lowcore(program_new_psw, lc->program_new_psw);
+       for (cr = 0; cr < ARRAY_SIZE(lc->cregs_save_area); cr++)
+               put_abs_lowcore(cregs_save_area[cr], lc->cregs_save_area[cr]);
 }
 
 static struct resource code_resource = {