Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b02a72a authored by John David Anglin's avatar John David Anglin Committed by Helge Deller
Browse files

parisc: Remove unused CONFIG_PARISC_TMPALIAS code 



The attached change removes the unused and experimental
CONFIG_PARISC_TMPALIAS code. It doesn't work and I don't believe it will
ever be used.

Signed-off-by: default avatarJohn David Anglin <dave.anglin@bell.net>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent a2fb4d78

arch/parisc/include/asm/page.h

+0 −11
Original line number Diff line number Diff line
@@ -32,17 +32,6 @@ void copy_page_asm(void *to, void *from); 
void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,

			struct page *pg);



/* #define CONFIG_PARISC_TMPALIAS */



#ifdef CONFIG_PARISC_TMPALIAS

void clear_user_highpage(struct page *page, unsigned long vaddr);

#define clear_user_highpage clear_user_highpage

struct vm_area_struct;

void copy_user_highpage(struct page *to, struct page *from,

	unsigned long vaddr, struct vm_area_struct *vma);

#define __HAVE_ARCH_COPY_USER_HIGHPAGE

#endif



/*

 * These are used to make use of C type-checking..

 */

arch/parisc/kernel/cache.c

+0 −64
Original line number Diff line number Diff line
@@ -581,67 +581,3 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long 
		__flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));

	}

}
 


#ifdef CONFIG_PARISC_TMPALIAS



void clear_user_highpage(struct page *page, unsigned long vaddr)

{

	void *vto;

	unsigned long flags;



	/* Clear using TMPALIAS region.  The page doesn't need to

	   be flushed but the kernel mapping needs to be purged.  */



	vto = kmap_atomic(page);



	/* The PA-RISC 2.0 Architecture book states on page F-6:

	   "Before a write-capable translation is enabled, *all*

	   non-equivalently-aliased translations must be removed

	   from the page table and purged from the TLB.  (Note

	   that the caches are not required to be flushed at this

	   time.)  Before any non-equivalent aliased translation

	   is re-enabled, the virtual address range for the writeable

	   page (the entire page) must be flushed from the cache,

	   and the write-capable translation removed from the page

	   table and purged from the TLB."  */



	purge_kernel_dcache_page_asm((unsigned long)vto);

	purge_tlb_start(flags);

	pdtlb_kernel(vto);

	purge_tlb_end(flags);

	preempt_disable();

	clear_user_page_asm(vto, vaddr);

	preempt_enable();



	pagefault_enable();		/* kunmap_atomic(addr, KM_USER0); */

}



void copy_user_highpage(struct page *to, struct page *from,

	unsigned long vaddr, struct vm_area_struct *vma)

{

	void *vfrom, *vto;

	unsigned long flags;



	/* Copy using TMPALIAS region.  This has the advantage

	   that the `from' page doesn't need to be flushed.  However,

	   the `to' page must be flushed in copy_user_page_asm since

	   it can be used to bring in executable code.  */



	vfrom = kmap_atomic(from);

	vto = kmap_atomic(to);



	purge_kernel_dcache_page_asm((unsigned long)vto);

	purge_tlb_start(flags);

	pdtlb_kernel(vto);

	pdtlb_kernel(vfrom);

	purge_tlb_end(flags);

	preempt_disable();

	copy_user_page_asm(vto, vfrom, vaddr);

	flush_dcache_page_asm(__pa(vto), vaddr);

	preempt_enable();



	pagefault_enable();		/* kunmap_atomic(addr, KM_USER1); */

	pagefault_enable();		/* kunmap_atomic(addr, KM_USER0); */

}



#endif /* CONFIG_PARISC_TMPALIAS */