From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alberto Bertogli Subject: [PATCH 3/4] Do not __always_inline bvec_kmap_irq() and bvec_kunmap_irq() Date: Wed, 20 May 2009 16:05:06 -0300 Message-ID: <1242846306-1346-1-git-send-email-albertito@blitiri.com.ar> Cc: linux-kernel@vger.kernel.org, jens.axboe@oracle.com, Alberto Bertogli To: linux-fsdevel@vger.kernel.org Return-path: Received: from alerce.vps.bitfolk.com ([212.13.194.134]:3713 "EHLO alerce.vps.bitfolk.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753237AbZETT6F (ORCPT ); Wed, 20 May 2009 15:58:05 -0400 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Tue, Feb 03 2009, Andrew Morton wrote: > The comment is wrong - this was a sparc requirement, long since removed. So remove both the comment and the inline requirement, going back to the inline hint. Signed-off-by: Alberto Bertogli --- include/linux/bio.h | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index 7b214fd..df8fef0 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -452,11 +452,8 @@ extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly; /* * remember never ever reenable interrupts between a bvec_kmap_irq and * bvec_kunmap_irq! - * - * This function MUST be inlined - it plays with the CPU interrupt flags. */ -static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec, - unsigned long *flags) +static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags) { unsigned long addr; @@ -472,8 +469,7 @@ static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec, return (char *) addr + bvec->bv_offset; } -static __always_inline void bvec_kunmap_irq(char *buffer, - unsigned long *flags) +static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) { unsigned long ptr = (unsigned long) buffer & PAGE_MASK; -- 1.6.2.2.646.gb214