Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9b7131542178f5f948e4bb6bea6e1c545e697b06

Authored by Len Brown
1 parent 81e242d0ef

Revert "cpuidle: build fix for non-x86" 

This reverts commit f757397097d0713c949af76dccabb65a2785782e.
which ironically broke the ia64 build

Showing 3 changed files with 1 additions and 17 deletions Side-by-side Diff

... ... @@ -98,9 +98,6 @@
98 98 config ARCH_HAS_ILOG2_U64
99 99 def_bool n
100 100  
101   -config ARCH_HAS_CPU_IDLE_WAIT
102   - def_bool y
103   -
104 101 config GENERIC_CALIBRATE_DELAY
105 102 def_bool y
106 103  
drivers/cpuidle/cpuidle.c
Diff comments   View file @ 9b71315
... ... @@ -83,7 +83,7 @@
83 83 {
84 84 if (enabled_devices && (pm_idle != pm_idle_old)) {
85 85 pm_idle = pm_idle_old;
86   - cpuidle_kick_cpus();
  86 + cpu_idle_wait();
87 87 }
88 88 }
89 89  
include/linux/cpuidle.h
Diff comments   View file @ 9b71315
... ... @@ -73,19 +73,6 @@
73 73 state->driver_data = data;
74 74 }
75 75  
76   -#ifdef CONFIG_SMP
77   -#ifdef CONFIG_ARCH_HAS_CPU_IDLE_WAIT
78   -static inline void cpuidle_kick_cpus(void)
79   -{
80   - cpu_idle_wait();
81   -}
82   -#else /* !CONFIG_ARCH_HAS_CPU_IDLE_WAIT */
83   -#error "Arch needs cpu_idle_wait() equivalent here"
84   -#endif /* !CONFIG_ARCH_HAS_CPU_IDLE_WAIT */
85   -#else /* !CONFIG_SMP */
86   -static inline void cpuidle_kick_cpus(void) {}
87   -#endif /* !CONFIG_SMP */
88   -
89 76 struct cpuidle_state_kobj {
90 77 struct cpuidle_state *state;
91 78 struct completion kobj_unregister;