[2.6 patch] kill __always_inline

From: Adrian Bunk (bunk_at_fs.tum.de)
Date: 09/01/04

  • Next message: Adrian Bunk: "[patch] update email address of Pedro Roque Marques (fwd)" 
    Date:	Wed, 1 Sep 2004 00:13:48 +0200
To: Andrew Morton <akpm@osdl.org>, Andi Kleen <ak@muc.de>

    An issue that we already discussed at 2.6.8-rc2-mm2 times:

    2.6.9-rc1 includes __always_inline which was formerly in -mm.
    __always_inline doesn't make any sense:

    __always_inline is _exactly_ the same as __inline__, __inline and inline .

    The patch below removes __always_inline again:

    Signed-off-by: Adrian Bunk <bunk@fs.tum.de>

    --- linux-2.6.9-rc1-mm2-full/include/linux/compiler.h.old 2004-08-31 23:30:51.000000000 +0200
    +++ linux-2.6.9-rc1-mm2-full/include/linux/compiler.h 2004-08-31 23:31:09.000000000 +0200
    @@ -124,8 +124,4 @@
     #define noinline
     #endif
     
    -#ifndef __always_inline
    -#define __always_inline inline
    -#endif
    -
     #endif /* __LINUX_COMPILER_H */
    --- linux-2.6.9-rc1-mm2-full/include/asm-i386/fixmap.h.old 2004-08-31 23:31:35.000000000 +0200
    +++ linux-2.6.9-rc1-mm2-full/include/asm-i386/fixmap.h 2004-08-31 23:31:47.000000000 +0200
    @@ -129,7 +129,7 @@
      * directly without tranlation, we catch the bug with a NULL-deference
      * kernel oops. Illegal ranges of incoming indices are caught too.
      */
    -static __always_inline unsigned long fix_to_virt(const unsigned int idx)
    +static inline unsigned long fix_to_virt(const unsigned int idx)
     {
             /*
              * this branch gets completely eliminated after inlining,

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Adrian Bunk: "[patch] update email address of Pedro Roque Marques (fwd)"

    Relevant Pages