PPC64: Trivial Cleanup: EEH_REGION
PATCH 1/1 PPC64: Trivial Cleanup: EEH_REGION
This patch is originally from Linas Vepstas <[email protected]>.
This is a dumb, dorky cleanup patch:
Per last round of emails, the concept of EEH_REGION is gone, but a few stubs remained. This patch removes them.
Signed-off-by Linas Vepstas <[email protected]>
Signed-off-by Paul Mackerras <[email protected]>
arch/ppc64/mm/hash_utils.c +0 -6
@@ -294,12 +294,6 @@ vsid =get_kernel_vsid (ea);break ;#if 0 -case EEH_REGION_ID : -/* -* Should only be hit if there is an access to MMIO space -* which is protected by EEH. -* Send the problem up to do_page_fault -*/ case KERNEL_REGION_ID :/* * Should never get here - entire 0xC0... region is bolted.
arch/ppc64/mm/slb.c +3 -6
@@ -78,7 +78,7 @@void switch_slb (struct task_struct *tsk,struct mm_struct *mm) {unsigned long offset =get_paca ()->slb_cache_ptr; -unsigned long esid_data; +unsigned long esid_data =0 ;unsigned long pc =KSTK_EIP (tsk);unsigned long stack =KSTK_ESP (tsk);unsigned long unmapped_base;
@@ -97,11 +97,8 @@ }/* Workaround POWER5 < DD2.1 issue */ -if (offset ==1 || offset >SLB_CACHE_ENTRIES ) { -/* flush segment in EEH region, we shouldn't ever -* access addresses in this region. */ - asmvolatile ("slbie %0" : :"r" (EEHREGIONBASE )); - } +if (offset ==1 || offset >SLB_CACHE_ENTRIES ) + asmvolatile ("slbie %0" : :"r" (esid_data));get_paca ()->slb_cache_ptr =0 ;get_paca ()->context = mm->context;
include/asm-ppc64/page.h +0 -2
@@ -205,10 +205,8 @@#define KERNELBASE PAGE_OFFSET#define VMALLOCBASE ASM_CONST(0xD000000000000000)#define IOREGIONBASE ASM_CONST(0xE000000000000000) -#define EEHREGIONBASE ASM_CONST(0xA000000000000000)#define IO_REGION_ID (IOREGIONBASE>>REGION_SHIFT) -#define EEH_REGION_ID (EEHREGIONBASE>>REGION_SHIFT)#define VMALLOC_REGION_ID (VMALLOCBASE>>REGION_SHIFT)#define KERNEL_REGION_ID (KERNELBASE>>REGION_SHIFT)#define USER_REGION_ID (0UL)