lkml.org 
[lkml]   [2010]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: Linux 2.6.37-rc3 (fixmap build error)
    On Sun, 21 Nov 2010 20:33:07 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:

    > On Sun, Nov 21, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote:
    > >
    > > I thought that I saw a patch for this one, but I can't find it now.
    > >
    > > on i386:
    > > arch/x86/built-in.o: In function `fix_to_virt':
    > > /usr/builds/linux-2.6.37-rc3/arch/x86/include/asm/fixmap.h:207: undefined reference to `__this_fixmap_does_not_exist'
    >
    > Hmm. Does it help to mark __set_fixmap_offset() as "__always_inline"
    > rather than just "inline"?

    yup.

    Subject: arch/x86/include/asm/fixmap.h: mark __set_fixmap_offset as __always_inline
    From: Andrew Morton <akpm@linux-foundation.org>

    When compiling arch/x86/kernel/early_printk_mrst.c with i386 allmodconfig,
    gcc-4.1.0 generates an out-of-line copy of __set_fixmap_offset() which
    contains a reference to __this_fixmap_does_not_exist which the compiler cannot
    elide.

    Marking __set_fixmap_offset() as __always_inline prevents this.

    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Feng Tang <feng.tang@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    ---

    arch/x86/include/asm/fixmap.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff -puN arch/x86/kernel/early_printk_mrst.c~arch-x86-include-asm-fixmaph-mark-__set_fixmap_offset-as-__always_inline arch/x86/kernel/early_printk_mrst.c
    diff -puN arch/x86/include/asm/fixmap.h~arch-x86-include-asm-fixmaph-mark-__set_fixmap_offset-as-__always_inline arch/x86/include/asm/fixmap.h
    --- a/arch/x86/include/asm/fixmap.h~arch-x86-include-asm-fixmaph-mark-__set_fixmap_offset-as-__always_inline
    +++ a/arch/x86/include/asm/fixmap.h
    @@ -220,8 +220,8 @@ static inline unsigned long virt_to_fix(
    }

    /* Return an pointer with offset calculated */
    -static inline unsigned long __set_fixmap_offset(enum fixed_addresses idx,
    - phys_addr_t phys, pgprot_t flags)
    +static __always_inline unsigned long
    +__set_fixmap_offset(enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)
    {
    __set_fixmap(idx, phys, flags);
    return fix_to_virt(idx) + (phys & (PAGE_SIZE - 1));
    _


    \
     
     \ /
      Last update: 2010-11-22 06:51    [W:0.023 / U:30.168 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site