From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933235AbYDQBVJ (ORCPT ); Wed, 16 Apr 2008 21:21:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758667AbYDQBI1 (ORCPT ); Wed, 16 Apr 2008 21:08:27 -0400 Received: from sous-sol.org ([216.99.217.87]:58928 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755130AbYDQBI0 (ORCPT ); Wed, 16 Apr 2008 21:08:26 -0400 Message-Id: <20080417010350.654976705@sous-sol.org> References: <20080417010122.148289106@sous-sol.org> User-Agent: quilt/0.46-1 Date: Wed, 16 Apr 2008 18:02:06 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "David S. Miller" Subject: SPARC64: Fix __get_cpu_var in preemption-enabled area. Content-Disposition: inline; filename=sparc64-fix-__get_cpu_var-in-preemption-enabled-area.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. --------------------- From: David S. Miller Upstream commit: 69072f6e8e4bd4799d2a54e4ff8771d0657512c1 Reported by Mariusz Kozlowski. Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- arch/sparc64/mm/tlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/sparc64/mm/tlb.c +++ b/arch/sparc64/mm/tlb.c @@ -23,10 +23,11 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga void flush_tlb_pending(void) { - struct mmu_gather *mp = &__get_cpu_var(mmu_gathers); + struct mmu_gather *mp; preempt_disable(); + mp = &__get_cpu_var(mmu_gathers); if (mp->tlb_nr) { flush_tsb_user(mp); --