sparc32: use inline versions of pgprot_noncached, pte_to_pgoff and pgoff_to_pte
We no longer have different versions of these so use a few simple static inline functions. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
e7b7e0c356
commit
afaedde7c9
@@ -2144,23 +2144,6 @@ static void smp_flush_page_for_dma(unsigned long page)
|
||||
|
||||
#endif
|
||||
|
||||
static pte_t srmmu_pgoff_to_pte(unsigned long pgoff)
|
||||
{
|
||||
return __pte((pgoff << SRMMU_PTE_FILE_SHIFT) | SRMMU_FILE);
|
||||
}
|
||||
|
||||
static unsigned long srmmu_pte_to_pgoff(pte_t pte)
|
||||
{
|
||||
return pte_val(pte) >> SRMMU_PTE_FILE_SHIFT;
|
||||
}
|
||||
|
||||
static pgprot_t srmmu_pgprot_noncached(pgprot_t prot)
|
||||
{
|
||||
prot &= ~__pgprot(SRMMU_CACHE);
|
||||
|
||||
return prot;
|
||||
}
|
||||
|
||||
/* Load up routines and constants for sun4m and sun4d mmu */
|
||||
void __init ld_mmu_srmmu(void)
|
||||
{
|
||||
@@ -2183,7 +2166,6 @@ void __init ld_mmu_srmmu(void)
|
||||
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
|
||||
|
||||
/* Functions */
|
||||
BTFIXUPSET_CALL(pgprot_noncached, srmmu_pgprot_noncached, BTFIXUPCALL_NORM);
|
||||
#ifndef CONFIG_SMP
|
||||
BTFIXUPSET_CALL(___xchg32, ___xchg32_sun4md, BTFIXUPCALL_SWAPG1G2);
|
||||
#endif
|
||||
@@ -2250,9 +2232,6 @@ void __init ld_mmu_srmmu(void)
|
||||
|
||||
BTFIXUPSET_CALL(mmu_info, srmmu_mmu_info, BTFIXUPCALL_NORM);
|
||||
|
||||
BTFIXUPSET_CALL(pte_to_pgoff, srmmu_pte_to_pgoff, BTFIXUPCALL_NORM);
|
||||
BTFIXUPSET_CALL(pgoff_to_pte, srmmu_pgoff_to_pte, BTFIXUPCALL_NORM);
|
||||
|
||||
get_srmmu_type();
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
|
Reference in New Issue
Block a user