diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-23 01:36:17 (GMT) |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-23 01:36:17 (GMT) |
commit | daefd89efc279b142bbb054577c2d706da211723 (patch) | |
tree | 2298056232548f6f22d7bbff2662a2bbf64520de /arch/x86/platform | |
parent | 6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff) | |
parent | f86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff) | |
download | linux-fsl-qoriq-daefd89efc279b142bbb054577c2d706da211723.tar.xz |
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'arch/x86/platform')
-rw-r--r-- | arch/x86/platform/uv/tlb_uv.c | 2 | ||||
-rw-r--r-- | arch/x86/platform/uv/uv_irq.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 9be4cff..3ae0e61 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -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); } } diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c index 374a05d..f25c276 100644 --- a/arch/x86/platform/uv/uv_irq.c +++ b/arch/x86/platform/uv/uv_irq.c @@ -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); |