From b47ed2c7d60e4305c7040eaa49ff16310ded59c0 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Thu, 26 Feb 2009 11:17:31 +0200
Subject: [PATCH] --- yaml --- r: 151450 b: refs/heads/master c:
 0c33cacd8672ef034ba414510f71ea2bd9370111 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/mm/kmemcheck/kmemcheck.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d4931feea3c8..4905fc165f69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b53b76a6158cd831759d7b0b2585bf0b121cec2
+refs/heads/master: 0c33cacd8672ef034ba414510f71ea2bd9370111
diff --git a/trunk/arch/x86/mm/kmemcheck/kmemcheck.c b/trunk/arch/x86/mm/kmemcheck/kmemcheck.c
index f03ee91ac469..a644f248451b 100644
--- a/trunk/arch/x86/mm/kmemcheck/kmemcheck.c
+++ b/trunk/arch/x86/mm/kmemcheck/kmemcheck.c
@@ -67,17 +67,19 @@ int __init kmemcheck_init(void)
 early_initcall(kmemcheck_init);
 
 #ifdef CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT
-int kmemcheck_enabled = 0;
+#  define KMEMCHECK_ENABLED 0
 #endif
 
 #ifdef CONFIG_KMEMCHECK_ENABLED_BY_DEFAULT
-int kmemcheck_enabled = 1;
+#  define KMEMCHECK_ENABLED 1
 #endif
 
 #ifdef CONFIG_KMEMCHECK_ONESHOT_BY_DEFAULT
-int kmemcheck_enabled = 2;
+#  define KMEMCHECK_ENABLED 2
 #endif
 
+int kmemcheck_enabled = KMEMCHECK_ENABLED;
+
 /*
  * We need to parse the kmemcheck= option before any memory is allocated.
  */