diff --git a/[refs] b/[refs] index 918686bb1fa7..b9cb47fa0e7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62e7bec49479e0c61e8cfd914f722a9ca6fd52e5 +refs/heads/master: 975d260355fca4734b545a0e3366672af0356905 diff --git a/trunk/kernel/padata.c b/trunk/kernel/padata.c index 6f9bcb8313d6..0282478bc584 100644 --- a/trunk/kernel/padata.c +++ b/trunk/kernel/padata.c @@ -569,8 +569,8 @@ void padata_stop(struct padata_instance *pinst) } EXPORT_SYMBOL(padata_stop); -static int __cpuinit padata_cpu_callback(struct notifier_block *nfb, - unsigned long action, void *hcpu) +static int padata_cpu_callback(struct notifier_block *nfb, + unsigned long action, void *hcpu) { int err; struct padata_instance *pinst;