blob: 2dc1abda6e7e0b4ec9e717ba6fdb5baded238c17 [file] [log] [blame]
From 47dd96605da943fe8d5867a60a86d448213da9e6 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sun, 23 Jan 2011 13:00:04 -0500
Subject: [PATCH] make takeover_delayed_drop depend on HOTPLUG_CPU
This is one of several extractions from the merge up to 33-rc8.
See it in a git tip repo with:
git diff 5f854cfc024622e4aae14d7cf422f6ff86278688^2 \
5f854cfc024622e4aae14d7cf422f6ff86278688 kernel/fork.c
You can find the origin of this change in the tip merge commit:
commit 5f854cfc024622e4aae14d7cf422f6ff86278688
Merge: cc24da0 4ec62b2
Author: Thomas Gleixner <tglx@linutronix.de>
Date: Sun Feb 21 20:17:22 2010 +0100
Forward to 2.6.33-rc8
Merge branch 'linus' into rt/head with a pile of conflicts.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Normally there are not significant changes/additions in a merge commit that
are not from any other "normal" commit. But in this case there are, so
break them out into separate explicit commits.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/fork.c b/kernel/fork.c
index f9cb88c..6dc8e27 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1844,6 +1844,7 @@ void __mmdrop_delayed(struct mm_struct *mm)
put_cpu_var(delayed_drop_list);
}
+#ifdef CONFIG_HOTPLUG_CPU
static void takeover_delayed_drop(int hotcpu)
{
struct list_head *head = &per_cpu(delayed_drop_list, hotcpu);
@@ -1856,6 +1857,7 @@ static void takeover_delayed_drop(int hotcpu)
__mmdrop_delayed(mm);
}
}
+#endif
static int desched_thread(void * __bind_cpu)
{
--
1.7.1.1