diff options
| -rw-r--r-- | arch/s390/kernel/fpu.c | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/vtime.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/fpu.c b/arch/s390/kernel/fpu.c index 594464f2129d..0da378e2eb25 100644 --- a/arch/s390/kernel/fpu.c +++ b/arch/s390/kernel/fpu.c | |||
| @@ -23,7 +23,7 @@ void __kernel_fpu_begin(struct kernel_fpu *state, u32 flags) | |||
| 23 | 23 | ||
| 24 | if (flags & KERNEL_FPC) | 24 | if (flags & KERNEL_FPC) |
| 25 | /* Save floating point control */ | 25 | /* Save floating point control */ |
| 26 | asm volatile("stfpc %0" : "=m" (state->fpc)); | 26 | asm volatile("stfpc %0" : "=Q" (state->fpc)); |
| 27 | 27 | ||
| 28 | if (!MACHINE_HAS_VX) { | 28 | if (!MACHINE_HAS_VX) { |
| 29 | if (flags & KERNEL_VXR_V0V7) { | 29 | if (flags & KERNEL_VXR_V0V7) { |
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index a69a0911ed0e..c475ca49cfc6 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
| @@ -37,7 +37,7 @@ static inline u64 get_vtimer(void) | |||
| 37 | { | 37 | { |
| 38 | u64 timer; | 38 | u64 timer; |
| 39 | 39 | ||
| 40 | asm volatile("stpt %0" : "=m" (timer)); | 40 | asm volatile("stpt %0" : "=Q" (timer)); |
| 41 | return timer; | 41 | return timer; |
| 42 | } | 42 | } |
| 43 | 43 | ||
| @@ -48,7 +48,7 @@ static inline void set_vtimer(u64 expires) | |||
| 48 | asm volatile( | 48 | asm volatile( |
| 49 | " stpt %0\n" /* Store current cpu timer value */ | 49 | " stpt %0\n" /* Store current cpu timer value */ |
| 50 | " spt %1" /* Set new value imm. afterwards */ | 50 | " spt %1" /* Set new value imm. afterwards */ |
| 51 | : "=m" (timer) : "m" (expires)); | 51 | : "=Q" (timer) : "Q" (expires)); |
| 52 | S390_lowcore.system_timer += S390_lowcore.last_update_timer - timer; | 52 | S390_lowcore.system_timer += S390_lowcore.last_update_timer - timer; |
| 53 | S390_lowcore.last_update_timer = expires; | 53 | S390_lowcore.last_update_timer = expires; |
| 54 | } | 54 | } |
| @@ -135,8 +135,8 @@ static int do_account_vtime(struct task_struct *tsk) | |||
| 135 | #else | 135 | #else |
| 136 | " stck %1" /* Store current tod clock value */ | 136 | " stck %1" /* Store current tod clock value */ |
| 137 | #endif | 137 | #endif |
| 138 | : "=m" (S390_lowcore.last_update_timer), | 138 | : "=Q" (S390_lowcore.last_update_timer), |
| 139 | "=m" (S390_lowcore.last_update_clock)); | 139 | "=Q" (S390_lowcore.last_update_clock)); |
| 140 | clock = S390_lowcore.last_update_clock - clock; | 140 | clock = S390_lowcore.last_update_clock - clock; |
| 141 | timer -= S390_lowcore.last_update_timer; | 141 | timer -= S390_lowcore.last_update_timer; |
| 142 | 142 | ||
