From: Sam Ravnborg Date: Sun, 13 May 2012 08:45:18 +0000 (+0200) Subject: sparc32: drop btfixup in page_32.h X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb6f66f4056232d973ad7c111caad1aca151c363;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git sparc32: drop btfixup in page_32.h Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller --- diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h index 2afe1e68acf3..0c902ae219c7 100644 --- a/arch/sparc/include/asm/page_32.h +++ b/arch/sparc/include/asm/page_32.h @@ -110,10 +110,7 @@ typedef unsigned long iopgprot_t; typedef struct page *pgtable_t; extern unsigned long sparc_unmapped_base; - -BTFIXUPDEF_SETHI(sparc_unmapped_base) - -#define TASK_UNMAPPED_BASE BTFIXUP_SETHI(sparc_unmapped_base) +#define TASK_UNMAPPED_BASE sparc_unmapped_base #else /* !(__ASSEMBLY__) */ diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 61f9b7039760..a64b0bbda0ce 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -300,7 +300,6 @@ void __init paging_init(void) case sun4d: srmmu_paging_init(); sparc_unmapped_base = 0x50000000; - BTFIXUPSET_SETHI(sparc_unmapped_base, 0x50000000); break; default: prom_printf("paging_init: Cannot init paging on this Sparc\n");