summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Lord <mlord@pobox.com>2010-09-25 11:17:22 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-09-25 11:17:22 +0200
commite4ecda1b60bfd2333c12bbe71b153d3b6bdc831a (patch)
treeddb4ae7f187b8fff11afbf5d75968d93a130f9f9
parentc49825facfd4969585224a896a5e717f88450cad (diff)
downloadblackbird-op-linux-e4ecda1b60bfd2333c12bbe71b153d3b6bdc831a.tar.gz
blackbird-op-linux-e4ecda1b60bfd2333c12bbe71b153d3b6bdc831a.zip
Fix compile error in blk-exec.c for !CONFIG_DETECT_HUNG_TASK
Ensure that 'sysctl_hung_task_timeout_secs' is defined even when CONFIG_DETECT_HUNG_TASK is not set. This way we can safely reference it without need for ifdefs in the code elsewhere. eg. in block/blk-exec.c Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--include/linux/sched.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 1e2a6db2d7dd..dbafa9e34a2d 100644
--- a/include/linux/sched.h
+++ b/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. */
OpenPOWER on IntegriCloud