From 61c003c973a201dd12e49136274dc7722adfc920 Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Tue, 20 Aug 2013 13:28:34 +1000 Subject: [PATCH] kvm tools: powerpc: Fix init order for xics xics_init() assumes kvm->nrcpus is already setup. kvm->nrcpus is setup in kvm_cpu_init() Unfortunately xics_init() and kvm_cpu_init() both use base_init(). So depending on the order randomly determined by the compiler, xics_init() may initialised see kvm->nrcpus as 0 and not setup any of the icp VCPU pointers. This manifests itself later in boot when trying to raise an IRQ resulting in a null pointer deference/segv. This moves xics_init() to use dev_base_init() to ensure it happens after kvm_cpu_init(). Signed-off-by: Michael Neuling Signed-off-by: Pekka Enberg --- powerpc/xics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerpc/xics.c b/powerpc/xics.c index cf64a08..c1ef35b 100644 --- a/powerpc/xics.c +++ b/powerpc/xics.c @@ -505,7 +505,7 @@ static int xics_init(struct kvm *kvm) return 0; } -base_init(xics_init); +dev_base_init(xics_init); void kvm__irq_line(struct kvm *kvm, int irq, int level)