Commit eafcd205 authored by Sven Schnelle's avatar Sven Schnelle Committed by Vasily Gorbik

s390/drivers: Replace S390_lowcore by get_lowcore()

Replace all S390_lowcore usages in drivers/s390 by get_lowcore().
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 208da1d5
...@@ -50,9 +50,9 @@ static void __init sclp_early_facilities_detect(void) ...@@ -50,9 +50,9 @@ static void __init sclp_early_facilities_detect(void)
sclp.has_aisi = !!(sccb->fac118 & 0x10); sclp.has_aisi = !!(sccb->fac118 & 0x10);
sclp.has_zpci_lsi = !!(sccb->fac118 & 0x01); sclp.has_zpci_lsi = !!(sccb->fac118 & 0x01);
if (sccb->fac85 & 0x02) if (sccb->fac85 & 0x02)
S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP; get_lowcore()->machine_flags |= MACHINE_FLAG_ESOP;
if (sccb->fac91 & 0x40) if (sccb->fac91 & 0x40)
S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_GUEST; get_lowcore()->machine_flags |= MACHINE_FLAG_TLB_GUEST;
if (sccb->cpuoff > 134) { if (sccb->cpuoff > 134) {
sclp.has_diag318 = !!(sccb->byte_134 & 0x80); sclp.has_diag318 = !!(sccb->byte_134 & 0x80);
sclp.has_diag320 = !!(sccb->byte_134 & 0x04); sclp.has_diag320 = !!(sccb->byte_134 & 0x04);
......
...@@ -38,11 +38,11 @@ void sclp_early_wait_irq(void) ...@@ -38,11 +38,11 @@ void sclp_early_wait_irq(void)
cr0_new.sssm = 1; cr0_new.sssm = 1;
local_ctl_load(0, &cr0_new.reg); 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(); 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; psw_wait.mask = psw_mask | PSW_MASK_EXT | PSW_MASK_WAIT;
S390_lowcore.ext_int_code = 0; get_lowcore()->ext_int_code = 0;
do { do {
asm volatile( asm volatile(
...@@ -53,12 +53,12 @@ void sclp_early_wait_irq(void) ...@@ -53,12 +53,12 @@ void sclp_early_wait_irq(void)
"0:\n" "0:\n"
: [addr] "=&d" (addr), : [addr] "=&d" (addr),
[psw_wait_addr] "=Q" (psw_wait.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) : [psw_wait] "Q" (psw_wait)
: "cc", "memory"); : "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); local_ctl_load(0, &cr0.reg);
} }
......
...@@ -695,7 +695,7 @@ static void qdio_int_handler_pci(struct qdio_irq *irq_ptr) ...@@ -695,7 +695,7 @@ static void qdio_int_handler_pci(struct qdio_irq *irq_ptr)
return; return;
qdio_deliver_irq(irq_ptr); 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, static void qdio_handle_activate_check(struct qdio_irq *irq_ptr,
......
...@@ -99,7 +99,7 @@ static inline u32 clear_shared_ind(void) ...@@ -99,7 +99,7 @@ static inline u32 clear_shared_ind(void)
static void tiqdio_thinint_handler(struct airq_struct *airq, static void tiqdio_thinint_handler(struct airq_struct *airq,
struct tpi_info *tpi_info) 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(); u32 si_used = clear_shared_ind();
struct qdio_irq *irq; struct qdio_irq *irq;
......
...@@ -169,7 +169,7 @@ TRACE_EVENT(s390_cio_tpi, ...@@ -169,7 +169,7 @@ TRACE_EVENT(s390_cio_tpi,
else if (addr) else if (addr)
__entry->tpi_info = *addr; __entry->tpi_info = *addr;
else else
__entry->tpi_info = S390_lowcore.tpi_info; __entry->tpi_info = get_lowcore()->tpi_info;
__entry->cssid = __entry->tpi_info.schid.cssid; __entry->cssid = __entry->tpi_info.schid.cssid;
__entry->ssid = __entry->tpi_info.schid.ssid; __entry->ssid = __entry->tpi_info.schid.ssid;
__entry->schno = __entry->tpi_info.schid.sch_no; __entry->schno = __entry->tpi_info.schid.sch_no;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment