From 32c5d2b2c36d0d7cb555a4a9f6d48d1a6e33e760 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Mon, 14 Sep 2009 20:52:25 +0200
Subject: [PATCH] --- yaml --- r: 163048 b: refs/heads/master c:
 e34e77ce348feac3c8c607774efb1f8a9262127d h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a4cba9b3a76c..365f78e7b609 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 680b6cfd3cee30a7d997d49430fb73af84523853
+refs/heads/master: e34e77ce348feac3c8c607774efb1f8a9262127d
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce-severity.c b/trunk/arch/x86/kernel/cpu/mcheck/mce-severity.c
index bc35a073d151..8a85dd1b1aa1 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce-severity.c
+++ b/trunk/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 @@ static int __init severities_debugfs_init(void)
 	return -ENOMEM;
 }
 late_initcall(severities_debugfs_init);
+#endif