summaryrefslogtreecommitdiff
path: root/kernel/cpu.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2012-01-16 17:41:09 (GMT)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2012-01-16 17:41:18 (GMT)
commit51aa78271be9bf97df4ab19c3146e1f08e592c7e (patch)
treec09112e5c57178e20c29e8858a6d7c336cf8fb1c /kernel/cpu.c
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff)
parenta513f6bab0939800dcf1e7c075e733420cf967c5 (diff)
downloadlinux-51aa78271be9bf97df4ab19c3146e1f08e592c7e.tar.xz
Merge branch 'rcu/fixes-for-v3.2' into rcu/urgent
Merge reason: Add these commits so that fixes on this branch do not conflict with already-mainlined code. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/cpu.c')
-rw-r--r--kernel/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 563f136..9d448dd 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -380,6 +380,7 @@ out:
cpu_maps_update_done();
return err;
}
+EXPORT_SYMBOL_GPL(cpu_up);
#ifdef CONFIG_PM_SLEEP_SMP
static cpumask_var_t frozen_cpus;