git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a shutdown regression in intel_idle
[pandora-kernel.git]
/
drivers
/
idle
/
intel_idle.c
diff --git
a/drivers/idle/intel_idle.c
b/drivers/idle/intel_idle.c
index
7acb32e
..
1fa091e
100644
(file)
--- a/
drivers/idle/intel_idle.c
+++ b/
drivers/idle/intel_idle.c
@@
-263,7
+263,7
@@
static void __setup_broadcast_timer(void *arg)
clockevents_notify(reason, &cpu);
}
clockevents_notify(reason, &cpu);
}
-static int
__cpuinit
setup_broadcast_cpuhp_notify(struct notifier_block *n,
+static int setup_broadcast_cpuhp_notify(struct notifier_block *n,
unsigned long action, void *hcpu)
{
int hotcpu = (unsigned long)hcpu;
unsigned long action, void *hcpu)
{
int hotcpu = (unsigned long)hcpu;
@@
-273,15
+273,11
@@
static int __cpuinit setup_broadcast_cpuhp_notify(struct notifier_block *n,
smp_call_function_single(hotcpu, __setup_broadcast_timer,
(void *)true, 1);
break;
smp_call_function_single(hotcpu, __setup_broadcast_timer,
(void *)true, 1);
break;
- case CPU_DOWN_PREPARE:
- smp_call_function_single(hotcpu, __setup_broadcast_timer,
- (void *)false, 1);
- break;
}
return NOTIFY_OK;
}
}
return NOTIFY_OK;
}
-static struct notifier_block
__cpuinitdata
setup_broadcast_notifier = {
+static struct notifier_block setup_broadcast_notifier = {
.notifier_call = setup_broadcast_cpuhp_notify,
};
.notifier_call = setup_broadcast_cpuhp_notify,
};