From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756733Ab0FGLUZ (ORCPT ); Mon, 7 Jun 2010 07:20:25 -0400 Received: from [18.85.46.34] ([18.85.46.34]:37713 "EHLO bombadil.infradead.org" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756459Ab0FGLUV (ORCPT ); Mon, 7 Jun 2010 07:20:21 -0400 Message-Id: <20100607111407.768689094@chello.nl> User-Agent: quilt/0.48-1 Date: Mon, 07 Jun 2010 13:07:09 +0200 From: Peter Zijlstra To: Andrea Arcangeli , Avi Kivity , Thomas Gleixner , Rik van Riel , Ingo Molnar , akpm@linux-foundation.org, Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Benjamin Herrenschmidt , David Miller , Hugh Dickins , Mel Gorman , Nick Piggin , Peter Zijlstra , "Paul E. McKenney" , Russell King Subject: [PATCH 15/28] arm: Preemptible mmu_gather References: <20100607110654.606530953@chello.nl> Content-Disposition: inline; filename=mm-preempt-tlb-gather-arm.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix up the arm mmu_gahter code to conform to the new API. Cc: Russell King Signed-off-by: Peter Zijlstra --- arch/arm/include/asm/tlb.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) Index: linux-2.6/arch/arm/include/asm/tlb.h =================================================================== --- linux-2.6.orig/arch/arm/include/asm/tlb.h +++ linux-2.6/arch/arm/include/asm/tlb.h @@ -40,17 +40,11 @@ struct mmu_gather { unsigned long range_end; }; -DECLARE_PER_CPU(struct mmu_gather, mmu_gathers); - -static inline struct mmu_gather * -tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush) +static inline void +tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int full_mm_flush) { - struct mmu_gather *tlb = &get_cpu_var(mmu_gathers); - tlb->mm = mm; tlb->fullmm = full_mm_flush; - - return tlb; } static inline void @@ -61,8 +55,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, u /* keep the page table cache within bounds */ check_pgt_cache(); - - put_cpu_var(mmu_gathers); } /*