s390/drivers: Replace S390_lowcore by get_lowcore()

Replace all S390_lowcore usages in drivers/s390 by get_lowcore().

Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index 60a247fdb2a7648ce8bcd04333464d028e7d4622..42986284cc78ade04f720b707d8254d195f36680 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -50,9 +50,9 @@ static void __init sclp_early_facilities_detect(void)
        sclp.has_aisi = !!(sccb->fac118 & 0x10);
        sclp.has_zpci_lsi = !!(sccb->fac118 & 0x01);
        if (sccb->fac85 & 0x02)
-               S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;
+               get_lowcore()->machine_flags |= MACHINE_FLAG_ESOP;
        if (sccb->fac91 & 0x40)
-               S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_GUEST;
+               get_lowcore()->machine_flags |= MACHINE_FLAG_TLB_GUEST;
        if (sccb->cpuoff > 134) {
                sclp.has_diag318 = !!(sccb->byte_134 & 0x80);
                sclp.has_diag320 = !!(sccb->byte_134 & 0x04);

diff --git a/drivers/s390/char/sclp_early_core.c b/drivers/s390/char/sclp_early_core.c
index 9f6165cafdc3cd74ad03f6633f2d419ed4e11b6f..5a5383cceb6ff3489da4d58b4012e78b4e7c6f42 100644 (file)
--- a/drivers/s390/char/sclp_early_core.c
+++ b/drivers/s390/char/sclp_early_core.c
@@ -38,11 +38,11 @@ void sclp_early_wait_irq(void)
        cr0_new.sssm = 1;
        local_ctl_load(0, &cr0_new.reg);
 
-       psw_ext_save = S390_lowcore.external_new_psw;
+       psw_ext_save = get_lowcore()->external_new_psw;
        psw_mask = __extract_psw();
-       S390_lowcore.external_new_psw.mask = psw_mask;
+       get_lowcore()->external_new_psw.mask = psw_mask;
        psw_wait.mask = psw_mask | PSW_MASK_EXT | PSW_MASK_WAIT;
-       S390_lowcore.ext_int_code = 0;
+       get_lowcore()->ext_int_code = 0;
 
        do {
                asm volatile(
@@ -53,12 +53,12 @@ void sclp_early_wait_irq(void)
                        "0:\n"
                        : [addr] "=&d" (addr),
                          [psw_wait_addr] "=Q" (psw_wait.addr),
-                         [psw_ext_addr] "=Q" (S390_lowcore.external_new_psw.addr)
+                         [psw_ext_addr] "=Q" (get_lowcore()->external_new_psw.addr)
                        : [psw_wait] "Q" (psw_wait)
                        : "cc", "memory");
-       } while (S390_lowcore.ext_int_code != EXT_IRQ_SERVICE_SIG);
+       } while (get_lowcore()->ext_int_code != EXT_IRQ_SERVICE_SIG);
 
-       S390_lowcore.external_new_psw = psw_ext_save;
+       get_lowcore()->external_new_psw = psw_ext_save;
        local_ctl_load(0, &cr0.reg);
 }
 

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index a1cb39f4b7a27939dcf8ac247a30ed965957bd5e..b711bb17f9da92a82043fc48bf3d5ac703146acf 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -695,7 +695,7 @@ static void qdio_int_handler_pci(struct qdio_irq *irq_ptr)
                return;
 
        qdio_deliver_irq(irq_ptr);
-       irq_ptr->last_data_irq_time = S390_lowcore.int_clock;
+       irq_ptr->last_data_irq_time = get_lowcore()->int_clock;
 }
 
 static void qdio_handle_activate_check(struct qdio_irq *irq_ptr,

diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index ccd4ed93bd92ddacdafc4f28393fde530ad88fbe..f931954910c5abd678fcf93d1fe31f790f4ad4ac 100644 (file)
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -99,7 +99,7 @@ static inline u32 clear_shared_ind(void)
 static void tiqdio_thinint_handler(struct airq_struct *airq,
                                   struct tpi_info *tpi_info)
 {
-       u64 irq_time = S390_lowcore.int_clock;
+       u64 irq_time = get_lowcore()->int_clock;
        u32 si_used = clear_shared_ind();
        struct qdio_irq *irq;
 

diff --git a/drivers/s390/cio/trace.h b/drivers/s390/cio/trace.h
index a4c5c6736b31078b6424a4bc0cb44368b8f12db3..6bca5315ee2a6b53b7de5bc3933ded46eef0c0d1 100644 (file)
--- a/drivers/s390/cio/trace.h
+++ b/drivers/s390/cio/trace.h
@@ -169,7 +169,7 @@ TRACE_EVENT(s390_cio_tpi,
                else if (addr)
                        __entry->tpi_info = *addr;
                else
-                       __entry->tpi_info = S390_lowcore.tpi_info;
+                       __entry->tpi_info = get_lowcore()->tpi_info;
                __entry->cssid = __entry->tpi_info.schid.cssid;
                __entry->ssid = __entry->tpi_info.schid.ssid;
                __entry->schno = __entry->tpi_info.schid.sch_no;