Commit-ID: e34e77ce348feac3c8c607774efb1f8a9262127d
Gitweb: http://git.kernel.org/tip/e34e77ce348feac3c8c607774efb1f8a9262127d
Author: Andi Kleen <ak@xxxxxxxxxxxxxxx>
AuthorDate: Mon, 14 Sep 2009 20:52:25 +0200
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Mon, 14 Sep 2009 12:01:04 -0700
x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c
Fix compilation error in arch/x86/kernel/cpu/mcheck/mce-severity.c
when CONFIG_DEBUG_FS is disabled, introduced in commit
5be9ed251f58881dfc3dd6742a81ff9ad1a7bb04.
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c
index bc35a07..8a85dd1 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-severity.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c
@@ -139,6 +139,7 @@ int mce_severity(struct mce *a, int tolerant, char **msg)
}
}
+#ifdef CONFIG_DEBUG_FS
static void *s_start(struct seq_file *f, loff_t *pos)
{
if (*pos >= ARRAY_SIZE(severities))
@@ -212,3 +213,4 @@ err_out:
return -ENOMEM;
}
late_initcall(severities_debugfs_init);
+#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|