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

[linux-flexiantxendom0-natty.git] / kernel / padata.c

diff --git a/kernel/padata.c b/kernel/padata.c
index fd03513..5b44d0f 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -29,7 +29,7 @@
 #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)
 {
@@ -570,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;