diff --git a/[refs] b/[refs]
index 438c8f85b794..4a75386d2711 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbf6b1ba7ae12b3f7cb6b0d060b88d44649f9eda
+refs/heads/master: a3705799e2cc5fb69d88ad6a7f317a8f5597f18d
diff --git a/trunk/arch/sh/kernel/process.c b/trunk/arch/sh/kernel/process.c
index b2bda83baeef..077e06e1a889 100644
--- a/trunk/arch/sh/kernel/process.c
+++ b/trunk/arch/sh/kernel/process.c
@@ -26,8 +26,7 @@ void free_thread_info(struct thread_info *ti)
 void thread_info_cache_init(void)
 {
 	thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
-					      THREAD_SIZE, 0, NULL);
-	BUG_ON(thread_info_cache == NULL);
+					      THREAD_SIZE, SLAB_PANIC, NULL);
 }
 #else
 struct thread_info *alloc_thread_info(struct task_struct *tsk)