[PATCH] x86: remove __phys_reloc_hide
in [Kernel]
|
Prev: [PATCH] sh: remove RELOC_HIDE on exception handlers and syscall routines
Next: mfd: menelaus: Use macros instead of some constant magic numbers
From: Namhyung Kim on 8 Aug 2010 17:40 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 <namhyung(a)gmail.com> --- 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); #else #define __phys_addr(x) __phys_addr_nodebug(x) #endif -#define __phys_reloc_hide(x) RELOC_HIDE((x), 0) #ifdef CONFIG_FLATMEM #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) -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |