diff --git a/[refs] b/[refs]
index 34c4e106d27b..09c76bade271 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c49825facfd4969585224a896a5e717f88450cad
+refs/heads/master: e4ecda1b60bfd2333c12bbe71b153d3b6bdc831a
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 1e2a6db2d7dd..dbafa9e34a2d 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -336,6 +336,9 @@ extern unsigned long sysctl_hung_task_warnings;
 extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
 					 void __user *buffer,
 					 size_t *lenp, loff_t *ppos);
+#else
+/* Avoid need for ifdefs elsewhere in the code */
+enum { sysctl_hung_task_timeout_secs = 0 };
 #endif
 
 /* Attach to any functions which should be ignored in wchan output. */