Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[firefly-linux-kernel-4.4.55.git] / kernel / padata.c

diff --git a/kernel/padata.c b/kernel/padata.c
index 93caf65ff57c80cf52ce215e51c65694060d95af..5b44d0fa358e355b6de6335ec9691af340e8baca 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -25,10 +25,11 @@
 #include <linux/padata.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/rcupdate.h>
 
 #define MAX_SEQ_NR INT_MAX - NR_CPUS
-#define MAX_OBJ_NUM 10000 * NR_CPUS
+#define MAX_OBJ_NUM 1000
 
 static int padata_index_to_cpu(struct parallel_data *pd, int cpu_index)
 {
@@ -569,8 +570,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;