diff --git a/[refs] b/[refs]
index df5af8a15bda..a004ffdc79f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8628e7c89075834fc7b44629d09ff4f9043af114
+refs/heads/master: 97e3d94aac1c3e95bd04d1b186479a4df3663ab8
diff --git a/trunk/kernel/padata.c b/trunk/kernel/padata.c
index 0282478bc584..5085046d83fb 100644
--- a/trunk/kernel/padata.c
+++ b/trunk/kernel/padata.c
@@ -28,7 +28,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)
 {