diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-18 16:34:11 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-18 16:34:11 -0500 |
commit | 10baf04e95fbf7eb6089410220a547211dd2ffa7 (patch) | |
tree | 912204612987a3ce2ec0ed214d47911040d79cc1 /arch/ia64 | |
parent | fdbe0946d4c35d4cc784cfe0a5322708cfb7ade8 (diff) | |
parent | ca62cf59ceef10ff2ebca0e7f764507186870270 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (35 commits)
PM idle: remove global declaration of pm_idle
unicore32 idle: delete stray pm_idle comment
openrisc idle: delete pm_idle
mn10300 idle: delete pm_idle
microblaze idle: delete pm_idle
m32r idle: delete pm_idle, and other dead idle code
ia64 idle: delete pm_idle
cris idle: delete idle and pm_idle
ARM64 idle: delete pm_idle
ARM idle: delete pm_idle
blackfin idle: delete pm_idle
sparc idle: rename pm_idle to sparc_idle
sh idle: rename global pm_idle to static sh_idle
x86 idle: rename global pm_idle to static x86_idle
APM idle: register apm_cpu_idle via cpuidle
tools/power turbostat: display SMI count by default
intel_idle: export both C1 and C1E
cpuidle: remove vestage definition of cpuidle_state_usage.driver_data
x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag
x86 idle: remove mwait_idle() and "idle=mwait" cmdline param
...
Conflicts:
arch/x86/kernel/process.c (with PM / tracing commit 43720bd)
drivers/acpi/processor_idle.c (with ACPICA commit 4f84291)
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/process.c | 3 | ||||
-rw-r--r-- | arch/ia64/kernel/setup.c | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 31360cbbd5f8..e34f565f595a 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -57,8 +57,6 @@ void (*ia64_mark_idle)(int); | |||
57 | 57 | ||
58 | unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; | 58 | unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; |
59 | EXPORT_SYMBOL(boot_option_idle_override); | 59 | EXPORT_SYMBOL(boot_option_idle_override); |
60 | void (*pm_idle) (void); | ||
61 | EXPORT_SYMBOL(pm_idle); | ||
62 | void (*pm_power_off) (void); | 60 | void (*pm_power_off) (void); |
63 | EXPORT_SYMBOL(pm_power_off); | 61 | EXPORT_SYMBOL(pm_power_off); |
64 | 62 | ||
@@ -301,7 +299,6 @@ cpu_idle (void) | |||
301 | if (mark_idle) | 299 | if (mark_idle) |
302 | (*mark_idle)(1); | 300 | (*mark_idle)(1); |
303 | 301 | ||
304 | idle = pm_idle; | ||
305 | if (!idle) | 302 | if (!idle) |
306 | idle = default_idle; | 303 | idle = default_idle; |
307 | (*idle)(); | 304 | (*idle)(); |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index aaefd9b94f2f..2029cc0d2fc6 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -1051,7 +1051,6 @@ cpu_init (void) | |||
1051 | max_num_phys_stacked = num_phys_stacked; | 1051 | max_num_phys_stacked = num_phys_stacked; |
1052 | } | 1052 | } |
1053 | platform_cpu_init(); | 1053 | platform_cpu_init(); |
1054 | pm_idle = default_idle; | ||
1055 | } | 1054 | } |
1056 | 1055 | ||
1057 | void __init | 1056 | void __init |