From cec9bfb3358cf72304b8fff13ca5eede88a61f63 Mon Sep 17 00:00:00 2001 From: "cpw@sgi.com" Date: Tue, 21 Jun 2011 07:21:26 -0500 Subject: [PATCH] --- yaml --- r: 257275 b: refs/heads/master c: 00b30cf04a775b5292ab704f782394e36e25617d h: refs/heads/master i: 257273: 8850fcb43d0d8edb688a3e99de8c395a55ab717e 257271: dad7668efaec88938ef32eb0851ce9e1ac94674b v: v3 --- [refs] | 2 +- trunk/arch/x86/platform/uv/tlb_uv.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f0ef01ba0a57..588b8d616e17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6885685923ee786f26e7b170e3b961ac0fa14037 +refs/heads/master: 00b30cf04a775b5292ab704f782394e36e25617d diff --git a/trunk/arch/x86/platform/uv/tlb_uv.c b/trunk/arch/x86/platform/uv/tlb_uv.c index 68e467f69fec..34be65093309 100644 --- a/trunk/arch/x86/platform/uv/tlb_uv.c +++ b/trunk/arch/x86/platform/uv/tlb_uv.c @@ -1334,9 +1334,10 @@ static ssize_t tunables_write(struct file *file, const char __user *user, instr[count] = '\0'; - bcp = &per_cpu(bau_control, smp_processor_id()); - + cpu = get_cpu(); + bcp = &per_cpu(bau_control, cpu); ret = parse_tunables_write(bcp, instr, count); + put_cpu(); if (ret) return ret;