tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Sven Schnelle and committed by
Vasily Gorbik eafcd205 208da1d5

+11 -11
+2 -2
drivers/s390/char/sclp_early.c
··· 50 50 sclp.has_aisi = !!(sccb->fac118 & 0x10); 51 51 sclp.has_zpci_lsi = !!(sccb->fac118 & 0x01); 52 52 if (sccb->fac85 & 0x02) 53 - S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP; 53 + get_lowcore()->machine_flags |= MACHINE_FLAG_ESOP; 54 54 if (sccb->fac91 & 0x40) 55 - S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_GUEST; 55 + get_lowcore()->machine_flags |= MACHINE_FLAG_TLB_GUEST; 56 56 if (sccb->cpuoff > 134) { 57 57 sclp.has_diag318 = !!(sccb->byte_134 & 0x80); 58 58 sclp.has_diag320 = !!(sccb->byte_134 & 0x04);
+6 -6
drivers/s390/char/sclp_early_core.c
··· 38 38 cr0_new.sssm = 1; 39 39 local_ctl_load(0, &cr0_new.reg); 40 40 41 - psw_ext_save = S390_lowcore.external_new_psw; 41 + psw_ext_save = get_lowcore()->external_new_psw; 42 42 psw_mask = __extract_psw(); 43 - S390_lowcore.external_new_psw.mask = psw_mask; 43 + get_lowcore()->external_new_psw.mask = psw_mask; 44 44 psw_wait.mask = psw_mask | PSW_MASK_EXT | PSW_MASK_WAIT; 45 - S390_lowcore.ext_int_code = 0; 45 + get_lowcore()->ext_int_code = 0; 46 46 47 47 do { 48 48 asm volatile( ··· 53 53 "0:\n" 54 54 : [addr] "=&d" (addr), 55 55 [psw_wait_addr] "=Q" (psw_wait.addr), 56 - [psw_ext_addr] "=Q" (S390_lowcore.external_new_psw.addr) 56 + [psw_ext_addr] "=Q" (get_lowcore()->external_new_psw.addr) 57 57 : [psw_wait] "Q" (psw_wait) 58 58 : "cc", "memory"); 59 - } while (S390_lowcore.ext_int_code != EXT_IRQ_SERVICE_SIG); 59 + } while (get_lowcore()->ext_int_code != EXT_IRQ_SERVICE_SIG); 60 60 61 - S390_lowcore.external_new_psw = psw_ext_save; 61 + get_lowcore()->external_new_psw = psw_ext_save; 62 62 local_ctl_load(0, &cr0.reg); 63 63 } 64 64
+1 -1
drivers/s390/cio/qdio_main.c
··· 695 695 return; 696 696 697 697 qdio_deliver_irq(irq_ptr); 698 - irq_ptr->last_data_irq_time = S390_lowcore.int_clock; 698 + irq_ptr->last_data_irq_time = get_lowcore()->int_clock; 699 699 } 700 700 701 701 static void qdio_handle_activate_check(struct qdio_irq *irq_ptr,
+1 -1
drivers/s390/cio/qdio_thinint.c
··· 99 99 static void tiqdio_thinint_handler(struct airq_struct *airq, 100 100 struct tpi_info *tpi_info) 101 101 { 102 - u64 irq_time = S390_lowcore.int_clock; 102 + u64 irq_time = get_lowcore()->int_clock; 103 103 u32 si_used = clear_shared_ind(); 104 104 struct qdio_irq *irq; 105 105
+1 -1
drivers/s390/cio/trace.h
··· 169 169 else if (addr) 170 170 __entry->tpi_info = *addr; 171 171 else 172 - __entry->tpi_info = S390_lowcore.tpi_info; 172 + __entry->tpi_info = get_lowcore()->tpi_info; 173 173 __entry->cssid = __entry->tpi_info.schid.cssid; 174 174 __entry->ssid = __entry->tpi_info.schid.ssid; 175 175 __entry->schno = __entry->tpi_info.schid.sch_no;