diff options
Diffstat (limited to 'arch/s390/lib/delay.c')
| -rw-r--r-- | arch/s390/lib/delay.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c index daca7bad66de..8c0c68e7770e 100644 --- a/arch/s390/lib/delay.c +++ b/arch/s390/lib/delay.c @@ -33,7 +33,7 @@ EXPORT_SYMBOL(__delay);  static void __udelay_disabled(unsigned long long usecs)  { -	unsigned long cr0, cr0_new, psw_mask, flags; +	unsigned long cr0, cr0_new, psw_mask;  	struct s390_idle_data idle;  	u64 end; @@ -45,9 +45,8 @@ static void __udelay_disabled(unsigned long long usecs)  	psw_mask = __extract_psw() | PSW_MASK_EXT | PSW_MASK_WAIT;  	set_clock_comparator(end);  	set_cpu_flag(CIF_IGNORE_IRQ); -	local_irq_save(flags);  	psw_idle(&idle, psw_mask); -	local_irq_restore(flags); +	trace_hardirqs_off();  	clear_cpu_flag(CIF_IGNORE_IRQ);  	set_clock_comparator(S390_lowcore.clock_comparator);  	__ctl_load(cr0, 0, 0);  |