Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ebc71d authored by Cliff Wickman's avatar Cliff Wickman Committed by Ingo Molnar
Browse files

x86/uv: Fix uninitialized spinlocks 



Initialize two spinlocks in tlb_uv.c and also properly define/initialize
the uv_irq_lock.

The lack of explicit initialization seems to be functionally
harmless, but it is diagnosed when these are turned on:

        CONFIG_DEBUG_SPINLOCK=y
        CONFIG_DEBUG_MUTEXES=y
        CONFIG_DEBUG_LOCK_ALLOC=y
        CONFIG_LOCKDEP=y

Signed-off-by: default avatarCliff Wickman <cpw@sgi.com>
Cc: <stable@kernel.org>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Link: http://lkml.kernel.org/r/E1RnXd1-0003wU-PM@eag09.americas.sgi.com


[ Added the uv_irq_lock initialization fix by Dimitri Sivanich ]
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5a51467b

arch/x86/platform/uv/tlb_uv.c

+2 −0
Original line number Diff line number Diff line
@@ -1851,6 +1851,8 @@ static void __init init_per_cpu_tunables(void) 
		bcp->cong_reps			= congested_reps;

		bcp->cong_period		= congested_period;

		bcp->clocks_per_100_usec =	usec_2_cycles(100);

		spin_lock_init(&bcp->queue_lock);

		spin_lock_init(&bcp->uvhub_lock);

	}

}

arch/x86/platform/uv/uv_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct uv_irq_2_mmr_pnode{ 
	int			irq;

};



static spinlock_t		uv_irq_lock;

static DEFINE_SPINLOCK(uv_irq_lock);

static struct rb_root		uv_irq_root;



static int uv_set_irq_affinity(struct irq_data *, const struct cpumask *, bool);