summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Grall <julien.grall@linaro.org>2013-07-29 17:06:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-07 22:10:00 -0700
commit9e50b358ed4b8af18955ab07549ee2264b5b44f2 (patch)
treed24b94cc7e9f1eaff307d81e80ca1fb401e4ef83
parent39d163b38728dd85291afb2ba84f760368d9e8eb (diff)
downloadkernel-common-9e50b358ed4b8af18955ab07549ee2264b5b44f2.tar.gz
kernel-common-9e50b358ed4b8af18955ab07549ee2264b5b44f2.tar.bz2
kernel-common-9e50b358ed4b8af18955ab07549ee2264b5b44f2.zip
xen/arm: missing put_cpu in xen_percpu_init
commit 0d7febe58413884f6428143221971618fbf3a47d upstream. When CONFIG_PREEMPT is enabled, Linux will not be able to boot and warn: [ 4.127825] ------------[ cut here ]------------ [ 4.133376] WARNING: at init/main.c:699 do_one_initcall+0x150/0x158() [ 4.140738] initcall xen_init_events+0x0/0x10c returned with preemption imbalance This is because xen_percpu_init uses get_cpu but doesn't have the corresponding put_cpu. Signed-off-by: Julien Grall <julien.grall@linaro.org> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/xen/enlighten.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 13609e01f4b7..05db95d010ae 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -170,6 +170,7 @@ static void __init xen_percpu_init(void *unused)
per_cpu(xen_vcpu, cpu) = vcpup;
enable_percpu_irq(xen_events_irq, 0);
+ put_cpu();
}
static void xen_restart(char str, const char *cmd)