UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/idle: merge enabled_wait() and arch_cpu_idle() 

The only caller of enabled_wait() besides arch_cpu_idle() was
udelay(). Since that call doesn't exist anymore, merge enabled_wait()
and arch_cpu_idle().

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
This commit is contained in:
Heiko Carstens 2020-12-14 22:33:39 +01:00
parent e0d62dcb20
commit 44292c8684
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/s390/include/asm/processor.h
View File

@ -290,11 +290,6 @@ static inline unsigned long __rewind_psw(psw_t psw, unsigned long ilc)
return (psw.addr - ilc) & mask; return (psw.addr - ilc) & mask;
} }
/*
* Function to stop a processor until the next interrupt occurs
*/
void enabled_wait(void);
/* /*
* Function to drop a processor into disabled wait state * Function to drop a processor into disabled wait state
*/ */

11
arch/s390/kernel/idle.c
View File

@ -21,7 +21,7 @@
static DEFINE_PER_CPU(struct s390_idle_data, s390_idle); static DEFINE_PER_CPU(struct s390_idle_data, s390_idle);
void enabled_wait(void) void arch_cpu_idle(void)
{ {
struct s390_idle_data *idle = this_cpu_ptr(&s390_idle); struct s390_idle_data *idle = this_cpu_ptr(&s390_idle);
unsigned long long idle_time; unsigned long long idle_time;
@ -46,8 +46,9 @@ void enabled_wait(void)
idle->idle_count++; idle->idle_count++;
account_idle_time(cputime_to_nsecs(idle_time)); account_idle_time(cputime_to_nsecs(idle_time));
raw_write_seqcount_end(&idle->seqcount); raw_write_seqcount_end(&idle->seqcount);
raw_local_irq_enable();
} }
NOKPROBE_SYMBOL(enabled_wait); NOKPROBE_SYMBOL(arch_cpu_idle);
static ssize_t show_idle_count(struct device *dev, static ssize_t show_idle_count(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
@ -120,12 +121,6 @@ void arch_cpu_idle_enter(void)
{ {
} }
void arch_cpu_idle(void)
{
enabled_wait();
raw_local_irq_enable();
}
void arch_cpu_idle_exit(void) void arch_cpu_idle_exit(void)
{ {
} }