From fed3a0b66a904915602448803888e11f251b8fc5 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Sat, 9 Feb 2013 22:28:34 -0500 Subject: [PATCH] --- yaml --- r: 351093 b: refs/heads/master c: 3e7fc708eb41f6385cf5cf64a68417a4be822be8 h: refs/heads/master i: 351091: 36e3064c5ff1f845fa8275336598a258600af726 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/process.c | 3 --- trunk/arch/ia64/kernel/setup.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ea59e4dab076..7c05ab099f78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28f14185c818c3b6a02b4e0dc00d9aca100ce024 +refs/heads/master: 3e7fc708eb41f6385cf5cf64a68417a4be822be8 diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c index 31360cbbd5f8..e34f565f595a 100644 --- a/trunk/arch/ia64/kernel/process.c +++ b/trunk/arch/ia64/kernel/process.c @@ -57,8 +57,6 @@ void (*ia64_mark_idle)(int); unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; EXPORT_SYMBOL(boot_option_idle_override); -void (*pm_idle) (void); -EXPORT_SYMBOL(pm_idle); void (*pm_power_off) (void); EXPORT_SYMBOL(pm_power_off); @@ -301,7 +299,6 @@ cpu_idle (void) if (mark_idle) (*mark_idle)(1); - idle = pm_idle; if (!idle) idle = default_idle; (*idle)(); diff --git a/trunk/arch/ia64/kernel/setup.c b/trunk/arch/ia64/kernel/setup.c index aaefd9b94f2f..2029cc0d2fc6 100644 --- a/trunk/arch/ia64/kernel/setup.c +++ b/trunk/arch/ia64/kernel/setup.c @@ -1051,7 +1051,6 @@ cpu_init (void) max_num_phys_stacked = num_phys_stacked; } platform_cpu_init(); - pm_idle = default_idle; } void __init