| From c6d2f2c4b5fe5b6ba0cd9b18b78ceb0cf242f2c1 Mon Sep 17 00:00:00 2001 |
| From: Carsten Emde <C.Emde@osadl.org> |
| 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 <C.Emde@osadl.org> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/init/main.c b/init/main.c |
| index aabceff..39a4f75 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))) |
| -- |
| 1.7.1.1 |
| |
