[lkml]   [2010]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH] x86: remove __phys_reloc_hide
    remove unnecessary use of RELOC_HIDE(). It only does simple addition of ptr
    and offset, and in this case, offset 0, does nothing. It does NOT do anything
    with linker relocation things. I could find no reason to use it.

    The only user of __phys_reloc_hide() was __pa_symbol() so it can be removed
    safely here.

    Signed-off-by: Namhyung Kim <>
    arch/x86/include/asm/page.h | 5 ++---
    arch/x86/include/asm/page_32.h | 1 -
    arch/x86/include/asm/page_64_types.h | 1 -
    3 files changed, 2 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
    index 625c3f0..3da2a8e 100644
    --- a/arch/x86/include/asm/page.h
    +++ b/arch/x86/include/asm/page.h
    @@ -35,9 +35,8 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,

    #define __pa(x) __phys_addr((unsigned long)(x))
    #define __pa_nodebug(x) __phys_addr_nodebug((unsigned long)(x))
    -/* __pa_symbol should be used for C visible symbols.
    - This seems to be the official gcc blessed way to do such arithmetic. */
    -#define __pa_symbol(x) __pa(__phys_reloc_hide((unsigned long)(x)))
    +/* __pa_symbol should be used for C visible symbols. */
    +#define __pa_symbol(x) __pa(x)

    #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))

    diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h
    index da4e762..e78e52a 100644
    --- a/arch/x86/include/asm/page_32.h
    +++ b/arch/x86/include/asm/page_32.h
    @@ -15,7 +15,6 @@ extern unsigned long __phys_addr(unsigned long);
    #define __phys_addr(x) __phys_addr_nodebug(x)
    -#define __phys_reloc_hide(x) RELOC_HIDE((x), 0)

    #define pfn_valid(pfn) ((pfn) < max_mapnr)
    diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
    index 7639dbf..5a63066 100644
    --- a/arch/x86/include/asm/page_64_types.h
    +++ b/arch/x86/include/asm/page_64_types.h
    @@ -59,7 +59,6 @@ extern unsigned long max_pfn;
    extern unsigned long phys_base;

    extern unsigned long __phys_addr(unsigned long);
    -#define __phys_reloc_hide(x) (x)

    #define vmemmap ((struct page *)VMEMMAP_START)


     \ /
      Last update: 2010-08-08 23:41    [W:0.022 / U:1.136 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site