Merge branches 'pm-cpufreq-sched' and 'intel_pstate'

[linux-2.6-microblaze.git] / fs / xfs / xfs_sysctl.h

diff --git a/fs/xfs/xfs_sysctl.h b/fs/xfs/xfs_sysctl.h
index 984a349..82afee0 100644 (file)
--- a/fs/xfs/xfs_sysctl.h
+++ b/fs/xfs/xfs_sysctl.h
@@ -95,6 +95,7 @@ extern xfs_param_t    xfs_params;
 
 struct xfs_globals {
        int     log_recovery_delay;     /* log recovery delay (secs) */
+       bool    bug_on_assert;          /* BUG() the kernel on assert failure */
 };
 extern struct xfs_globals      xfs_globals;