From 1d1315c04e5736f43b21940a01a0d0a0f322b171 Mon Sep 17 00:00:00 2001 From: Carsten Emde Date: Sun, 2 May 2010 15:35:12 +0200 Subject: [PATCH] init: Fix config items in debug reminder finally commit dc15be1db7a1fd62b4662727f5a07d92213123aa in tip. 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 Signed-off-by: Thomas Gleixner Signed-off-by: Paul Gortmaker --- init/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/init/main.c b/init/main.c index ee05de3..0d67d3e 100644 --- a/init/main.c +++ b/init/main.c @@ -933,7 +933,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))) -- 1.7.0.4