summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Emde <C.Emde@osadl.org>2010-05-02 15:35:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-05-02 20:54:17 +0200
commitdc15be1db7a1fd62b4662727f5a07d92213123aa (patch)
tree8f18fa22b28942e45a55939460e7e3755f4a7592
parent34add88e093c7a0ca2d7c7cb41c2cae7f55b2ceb (diff)
downloadlwn-dc15be1db7a1fd62b4662727f5a07d92213123aa.tar.gz
lwn-dc15be1db7a1fd62b4662727f5a07d92213123aa.zip
init: Fix config items in debug reminder finally
After the recent repair of the debug config reminder, there was a duplicate config item, while the CONFIG_DEBUG_PAGEALLOC config item was missing. Signed-off-by: Carsten Emde <C.Emde@osadl.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index d4b3bf506dcb..a1d74a5ca4e6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -915,7 +915,7 @@ static int __init kernel_init(void * unused)
defined(CONFIG_INTERRUPT_OFF_HIST) + \
defined(CONFIG_PREEMPT_OFF_HIST) + \
defined(CONFIG_DEBUG_SLAB) + \
- defined(CONFIG_PREEMPT_OFF_HIST) + \
+ defined(CONFIG_DEBUG_PAGEALLOC) + \
defined(CONFIG_LOCKDEP) + \
(defined(CONFIG_FUNCTION_TRACER) - \
defined(CONFIG_FTRACE_MCOUNT_RECORD)))