5 files changed, 25 insertions, 28 deletions

diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c
index 85df4655d326..81edeab82d17 100644
--- a/arch/xtensa/mm/cache.c
+++ b/arch/xtensa/mm/cache.c
@@ -118,7 +118,7 @@ void flush_dcache_page(struct page *page)
  * For now, flush the whole cache. FIXME??
  */
 
-void flush_cache_range(struct vm_area_struct* vma, 
+void flush_cache_range(struct vm_area_struct* vma,
                        unsigned long start, unsigned long end)
 {
         __flush_invalidate_dcache_all();
@@ -133,7 +133,7 @@ void flush_cache_range(struct vm_area_struct* vma,
  */
 
 void flush_cache_page(struct vm_area_struct* vma, unsigned long address,
-                      unsigned long pfn)
+                      unsigned long pfn)
 {
         /* Note that we have to use the 'alias' address to avoid multi-hit */
 
@@ -166,14 +166,14 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep)
 
         if (!PageReserved(page) && test_bit(PG_arch_1, &page->flags)) {
 
-                unsigned long vaddr = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);
                 unsigned long paddr = (unsigned long) page_address(page);
                 unsigned long phys = page_to_phys(page);
+                unsigned long tmp = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);
 
                 __flush_invalidate_dcache_page(paddr);
 
-                __flush_invalidate_dcache_page_alias(vaddr, phys);
-                __invalidate_icache_page_alias(vaddr, phys);
+                __flush_invalidate_dcache_page_alias(tmp, phys);
+                __invalidate_icache_page_alias(tmp, phys);
 
                 clear_bit(PG_arch_1, &page->flags);
         }
@@ -195,7 +195,7 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep)
 
 #if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
 
-void copy_to_user_page(struct vm_area_struct *vma, struct page *page, 
+void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
                 unsigned long vaddr, void *dst, const void *src,
                 unsigned long len)
 {
@@ -205,8 +205,8 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
         /* Flush and invalidate user page if aliased. */
 
         if (alias) {
-                unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
-                __flush_invalidate_dcache_page_alias(temp, phys);
+                unsigned long t = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
+                __flush_invalidate_dcache_page_alias(t, phys);
         }
 
         /* Copy data */
@@ -219,12 +219,11 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
          */
 
         if (alias) {
-                unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
+                unsigned long t = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
 
                 __flush_invalidate_dcache_range((unsigned long) dst, len);
-                if ((vma->vm_flags & VM_EXEC) != 0) {
-                        __invalidate_icache_page_alias(temp, phys);
-                }
+                if ((vma->vm_flags & VM_EXEC) != 0)
+                        __invalidate_icache_page_alias(t, phys);
 
         } else if ((vma->vm_flags & VM_EXEC) != 0) {
                 __flush_dcache_range((unsigned long)dst,len);
@@ -245,8 +244,8 @@ extern void copy_from_user_page(struct vm_area_struct *vma, struct page *page,
          */
 
         if (alias) {
-                unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
-                __flush_invalidate_dcache_page_alias(temp, phys);
+                unsigned long t = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
+                __flush_invalidate_dcache_page_alias(t, phys);
         }
 
         memcpy(dst, src, len);
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 245b08f7eaf4..4b7bc8db170f 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -254,4 +254,3 @@ bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
         die("Oops", regs, sig);
         do_exit(sig);
 }
-
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index db955179da2d..7a5156ffebb6 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -75,15 +75,15 @@ int __init mem_reserve(unsigned long start, unsigned long end, int must_exist)
                         sysmem.nr_banks++;
                 }
                 sysmem.bank[i].end = start;
+
+        } else if (end < sysmem.bank[i].end) {
+                sysmem.bank[i].start = end;
+
         } else {
-                if (end < sysmem.bank[i].end)
-                        sysmem.bank[i].start = end;
-                else {
-                        /* remove entry */
-                        sysmem.nr_banks--;
-                        sysmem.bank[i].start = sysmem.bank[sysmem.nr_banks].start;
-                        sysmem.bank[i].end   = sysmem.bank[sysmem.nr_banks].end;
-                }
+                /* remove entry */
+                sysmem.nr_banks--;
+                sysmem.bank[i].start = sysmem.bank[sysmem.nr_banks].start;
+                sysmem.bank[i].end   = sysmem.bank[sysmem.nr_banks].end;
         }
         return -1;
 }
diff --git a/arch/xtensa/mm/misc.S b/arch/xtensa/mm/misc.S
index 7f7078f57c41..d97ed1ba7b0a 100644
--- a/arch/xtensa/mm/misc.S
+++ b/arch/xtensa/mm/misc.S
@@ -180,7 +180,7 @@ ENDPROC(clear_user_page)
 
 ENTRY(copy_user_page)
 
-        entry   a1, 32 
+        entry   a1, 32
 
         /* Mark page dirty and determine alias for destination. */
 
diff --git a/arch/xtensa/mm/tlb.c b/arch/xtensa/mm/tlb.c
index 070fb7a25231..5411aa67c68e 100644
--- a/arch/xtensa/mm/tlb.c
+++ b/arch/xtensa/mm/tlb.c
@@ -82,7 +82,7 @@ void flush_tlb_mm(struct mm_struct *mm)
 #endif
 
 void flush_tlb_range (struct vm_area_struct *vma,
-                      unsigned long start, unsigned long end)
+                      unsigned long start, unsigned long end)
 {
         struct mm_struct *mm = vma->vm_mm;
         unsigned long flags;
@@ -100,7 +100,7 @@ void flush_tlb_range (struct vm_area_struct *vma,
                 int oldpid = get_rasid_register();
                 set_rasid_register (ASID_INSERT(mm->context));
                 start &= PAGE_MASK;
-                if (vma->vm_flags & VM_EXEC)
+                if (vma->vm_flags & VM_EXEC)
                         while(start < end) {
                                 invalidate_itlb_mapping(start);
                                 invalidate_dtlb_mapping(start);
@@ -130,7 +130,7 @@ void flush_tlb_page (struct vm_area_struct *vma, unsigned long page)
 
         local_save_flags(flags);
 
-        oldpid = get_rasid_register();
+        oldpid = get_rasid_register();
 
         if (vma->vm_flags & VM_EXEC)
                 invalidate_itlb_mapping(page);
@@ -140,4 +140,3 @@ void flush_tlb_page (struct vm_area_struct *vma, unsigned long page)
 
         local_irq_restore(flags);
 }
-