4 files changed, 12 insertions, 69 deletions

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 12369b194c7b..2ce731f9aa4d 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -6,7 +6,7 @@ config FRV
         select HAVE_PERF_EVENTS
         select HAVE_UID16
         select HAVE_GENERIC_HARDIRQS
-        select HAVE_VIRT_TO_BUS
+        select VIRT_TO_BUS
         select GENERIC_IRQ_SHOW
         select HAVE_DEBUG_BUGVERBOSE
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 23916b2a12a2..5d40aeb7712e 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -59,29 +59,12 @@ static void core_sleep_idle(void)
         mb();
 }
 
-void (*idle)(void) = core_sleep_idle;
-
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        check_pgt_cache();
-
-                        if (!frv_dma_inprogress && idle)
-                                idle();
-                }
-                rcu_idle_exit();
-
-                schedule_preempt_disabled();
-        }
+        if (!frv_dma_inprogress)
+                core_sleep_idle();
+        else
+                local_irq_enable();
 }
 
 void machine_restart(char * __unused)
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 5cfd1420b091..4bff48c19d29 100644
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -466,17 +466,6 @@ asmlinkage void compound_exception(unsigned long esfr1,
         BUG();
 } /* end compound_exception() */
 
-/*****************************************************************************/
-/*
- * The architecture-independent backtrace generator
- */
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 void show_stack(struct task_struct *task, unsigned long *sp)
 {
 }
@@ -508,6 +497,7 @@ void show_regs(struct pt_regs *regs)
         int loop;
 
         printk("\n");
+        show_regs_print_info(KERN_DEFAULT);
 
         printk("Frame: @%08lx [%s]\n",
                (unsigned long) regs,
@@ -522,8 +512,6 @@ void show_regs(struct pt_regs *regs)
                 else
                         printk(" | ");
         }
-
-        printk("Process %s (pid: %d)\n", current->comm, current->pid);
 }
 
 void die_if_kernel(const char *str, ...)
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index 92e97b0894a6..dee354fa6b64 100644
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -122,7 +122,7 @@ void __init mem_init(void)
 #endif
         int codek = 0, datak = 0;
 
-        /* this will put all memory onto the freelists */
+        /* this will put all low memory onto the freelists */
         totalram_pages = free_all_bootmem();
 
 #ifdef CONFIG_MMU
@@ -131,14 +131,8 @@ void __init mem_init(void)
                         datapages++;
 
 #ifdef CONFIG_HIGHMEM
-        for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--) {
-                struct page *page = &mem_map[pfn];
-
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                totalram_pages++;
-        }
+        for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--)
+                free_highmem_page(&mem_map[pfn]);
 #endif
 
         codek = ((unsigned long) &_etext - (unsigned long) &_stext) >> 10;
@@ -168,21 +162,7 @@ void __init mem_init(void)
 void free_initmem(void)
 {
 #if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
-        unsigned long start, end, addr;
-
-        start = PAGE_ALIGN((unsigned long) &__init_begin);      /* round up */
-        end   = ((unsigned long) &__init_end) & PAGE_MASK;      /* round down */
-
-        /* next to check that the page we free is not a partial page */
-        for (addr = start; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-
-        printk("Freeing unused kernel memory: %ldKiB freed (0x%lx - 0x%lx)\n",
-               (end - start) >> 10, start, end);
+        free_initmem_default(0);
 #endif
 } /* end free_initmem() */
 
@@ -193,14 +173,6 @@ void free_initmem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        int pages = 0;
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-                pages++;
-        }
-        printk("Freeing initrd memory: %dKiB freed\n", (pages * PAGE_SIZE) >> 10);
+        free_reserved_area(start, end, 0, "initrd");
 } /* end free_initrd_mem() */
 #endif