diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 12:46:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 12:46:07 -0800 |
| commit | 2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1 (patch) | |
| tree | 04d9bb3455da26bce09deb8c9992e370356c6270 /arch/x86/platform/uv/tlb_uv.c | |
| parent | b57cea5e332841ed3e11586c88d3940ea4eacbe7 (diff) | |
| parent | 5b68edc91cdc972c46f76f85eded7ffddc3ff5c2 (diff) | |
| download | blackbird-op-linux-2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1.tar.gz blackbird-op-linux-2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode_amd: Add support for CPU family specific container files
x86/amd: Add missing feature flag for fam15h models 10h-1fh processors
x86/boot-image: Don't leak phdrs in arch/x86/boot/compressed/misc.c::Parse_elf()
x86/numachip: Drop unnecessary conflict with EDAC
x86/uv: Fix uninitialized spinlocks
x86/uv: Fix uv_gpa_to_soc_phys_ram() shift
Diffstat (limited to 'arch/x86/platform/uv/tlb_uv.c')
| -rw-r--r-- | arch/x86/platform/uv/tlb_uv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 9be4cff00a2d..3ae0e61abd23 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); } } |
