diff options
Diffstat (limited to 'arch/sh/mm/pmb.c')
| -rw-r--r-- | arch/sh/mm/pmb.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c index a4662e2782c..e43ec600afc 100644 --- a/arch/sh/mm/pmb.c +++ b/arch/sh/mm/pmb.c @@ -15,7 +15,6 @@  #include <linux/sysdev.h>  #include <linux/cpu.h>  #include <linux/module.h> -#include <linux/slab.h>  #include <linux/bitops.h>  #include <linux/debugfs.h>  #include <linux/fs.h> @@ -323,6 +322,7 @@ static void __clear_pmb_entry(struct pmb_entry *pmbe)  	writel_uncached(data_val & ~PMB_V, data);  } +#ifdef CONFIG_PM  static void set_pmb_entry(struct pmb_entry *pmbe)  {  	unsigned long flags; @@ -331,6 +331,7 @@ static void set_pmb_entry(struct pmb_entry *pmbe)  	__set_pmb_entry(pmbe);  	spin_unlock_irqrestore(&pmbe->lock, flags);  } +#endif /* CONFIG_PM */  int pmb_bolt_mapping(unsigned long vaddr, phys_addr_t phys,  		     unsigned long size, pgprot_t prot) @@ -802,7 +803,7 @@ void __init pmb_init(void)  	writel_uncached(0, PMB_IRMCR);  	/* Flush out the TLB */ -	__raw_writel(__raw_readl(MMUCR) | MMUCR_TI, MMUCR); +	local_flush_tlb_all();  	ctrl_barrier();  }  |