diff options
Diffstat (limited to 'arch/s390/boot')
| -rw-r--r-- | arch/s390/boot/ipl_parm.c | 2 | ||||
| -rw-r--r-- | arch/s390/boot/physmem_info.c | 6 | ||||
| -rw-r--r-- | arch/s390/boot/startup.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c index b49c906b57dc..d04e9b89d14a 100644 --- a/arch/s390/boot/ipl_parm.c +++ b/arch/s390/boot/ipl_parm.c @@ -37,7 +37,7 @@ static inline int __diag308(unsigned long subcode, void *addr) { union register_pair r1 = { .even = (unsigned long)addr, .odd = 0 }; - asm volatile( + asm_inline volatile( " diag %[r1],%[subcode],0x308\n" "0:\n" EX_TABLE(0b, 0b) diff --git a/arch/s390/boot/physmem_info.c b/arch/s390/boot/physmem_info.c index eb1badb93c40..45e3d057cfaa 100644 --- a/arch/s390/boot/physmem_info.c +++ b/arch/s390/boot/physmem_info.c @@ -67,7 +67,7 @@ static int __diag260(unsigned long rx1, unsigned long rx2) rx.odd = rx2; ry = 0x10; /* storage configuration */ exception = 1; - asm volatile( + asm_inline volatile( " diag %[rx],%[ry],0x260\n" "0: lhi %[exc],0\n" "1:\n" @@ -105,7 +105,7 @@ static int diag500_storage_limit(unsigned long *max_physmem_end) { unsigned long storage_limit; - asm volatile( + asm_inline volatile( " lghi %%r1,%[subcode]\n" " lghi %%r2,0\n" " diag %%r2,%%r4,0x500\n" @@ -126,7 +126,7 @@ static int tprot(unsigned long addr) int cc, exception; exception = 1; - asm volatile( + asm_inline volatile( " tprot 0(%[addr]),0\n" "0: lhi %[exc],0\n" "1:\n" diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c index 099b2327c781..06316fb8e0fa 100644 --- a/arch/s390/boot/startup.c +++ b/arch/s390/boot/startup.c @@ -77,7 +77,7 @@ static void detect_diag9c(void) int rc = 1; cpu = stap(); - asm volatile( + asm_inline volatile( " diag %[cpu],%%r0,0x9c\n" "0: lhi %[rc],0\n" "1:\n" @@ -138,7 +138,7 @@ static int cmma_test_essa(void) int rc = 1; /* Test ESSA_GET_STATE */ - asm volatile( + asm_inline volatile( " .insn rrf,0xb9ab0000,%[tmp],%[tmp],%[cmd],0\n" "0: lhi %[rc],0\n" "1:\n" |