From b538dc7fdf1d41c425bf5a404f30dda1886feb07 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Thu, 26 Jul 2012 11:02:21 +0000 Subject: [PATCH] --- yaml --- r: 318950 b: refs/heads/master c: c966a337fade515052121e6c3c32f38b463d5205 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/include/asm/page_32.h | 3 +-- trunk/arch/sparc/mm/init_32.c | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a30d5c719862..de3e0c33063e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d884297acac228f15a793850be167ba8f9dd3818 +refs/heads/master: c966a337fade515052121e6c3c32f38b463d5205 diff --git a/trunk/arch/sparc/include/asm/page_32.h b/trunk/arch/sparc/include/asm/page_32.h index fab78a308ebf..f82a1f36b655 100644 --- a/trunk/arch/sparc/include/asm/page_32.h +++ b/trunk/arch/sparc/include/asm/page_32.h @@ -107,8 +107,7 @@ typedef unsigned long iopgprot_t; typedef struct page *pgtable_t; -extern unsigned long sparc_unmapped_base; -#define TASK_UNMAPPED_BASE sparc_unmapped_base +#define TASK_UNMAPPED_BASE 0x50000000 #else /* !(__ASSEMBLY__) */ diff --git a/trunk/arch/sparc/mm/init_32.c b/trunk/arch/sparc/mm/init_32.c index e8ea360a4d9b..fc77bb8b576d 100644 --- a/trunk/arch/sparc/mm/init_32.c +++ b/trunk/arch/sparc/mm/init_32.c @@ -45,7 +45,6 @@ unsigned long pfn_base; EXPORT_SYMBOL(pfn_base); struct sparc_phys_banks sp_banks[SPARC_PHYS_BANKS+1]; -unsigned long sparc_unmapped_base; struct pgtable_cache_struct pgt_quicklists; @@ -297,7 +296,6 @@ void __init paging_init(void) case sun4m: case sun4d: srmmu_paging_init(); - sparc_unmapped_base = 0x50000000; break; default: prom_printf("paging_init: Cannot init paging on this Sparc\n");