8 files changed, 30 insertions, 61 deletions

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 2ce731f9aa4d..4b6628ea381e 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -14,6 +14,7 @@ config FRV
         select ARCH_WANT_IPC_PARSE_VERSION
         select OLD_SIGSUSPEND3
         select OLD_SIGACTION
+        select HAVE_DEBUG_STACKOVERFLOW
 
 config ZONE_DMA
         bool
diff --git a/arch/frv/Kconfig.debug b/arch/frv/Kconfig.debug
index 211f01bc4caa..98c99a3ed2be 100644
--- a/arch/frv/Kconfig.debug
+++ b/arch/frv/Kconfig.debug
@@ -2,10 +2,6 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
-config DEBUG_STACKOVERFLOW
-        bool "Check for stack overflows"
-        depends on DEBUG_KERNEL
-
 config GDBSTUB
         bool "Remote GDB kernel debugging"
         depends on DEBUG_KERNEL
diff --git a/arch/frv/include/asm/pgtable.h b/arch/frv/include/asm/pgtable.h
index 6bc241e4b4f8..eb0110acd19b 100644
--- a/arch/frv/include/asm/pgtable.h
+++ b/arch/frv/include/asm/pgtable.h
@@ -488,9 +488,6 @@ static inline int pte_file(pte_t pte)
 #define PageSkip(page)          (0)
 #define kern_addr_valid(addr)   (1)
 
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot)         \
-                remap_pfn_range(vma, vaddr, pfn, size, prot)
-
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
 #define __HAVE_ARCH_PTEP_SET_WRPROTECT
diff --git a/arch/frv/include/asm/uaccess.h b/arch/frv/include/asm/uaccess.h
index 0b67ec5b4414..3ac9a59d65d4 100644
--- a/arch/frv/include/asm/uaccess.h
+++ b/arch/frv/include/asm/uaccess.h
@@ -280,14 +280,14 @@ extern long __memcpy_user(void *dst, const void *src, unsigned long count);
 static inline unsigned long __must_check
 __copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-       might_sleep();
+       might_fault();
        return __copy_to_user_inatomic(to, from, n);
 }
 
 static inline unsigned long
 __copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-       might_sleep();
+       might_fault();
        return __copy_from_user_inatomic(to, from, n);
 }
 
diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S
index e9a8cc63ac94..a7d0bea9c036 100644
--- a/arch/frv/kernel/head.S
+++ b/arch/frv/kernel/head.S
@@ -479,11 +479,6 @@ __head_mmu_enabled:
 
         LEDS            0x000c
 
-        # initialise the processor and the peripherals
-        #call           SYMBOL_NAME(processor_init)
-        #call           SYMBOL_NAME(unit_init)
-        #LEDS           0x0aff
-
         sethi.p         #0xe5e5,gr3
         setlo           #0xe5e5,gr3
         or.p            gr3,gr0,gr4
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index a5136474c6fd..ae3a6706419b 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -735,7 +735,7 @@ static void __init parse_cmdline_early(char *cmdline)
                 /* "mem=XXX[kKmM]" sets SDRAM size to <mem>, overriding the value we worked
                  * out from the SDRAM controller mask register
                  */
-                if (!memcmp(cmdline, "mem=", 4)) {
+                if (!strncmp(cmdline, "mem=", 4)) {
                         unsigned long long mem_size;
 
                         mem_size = memparse(cmdline + 4, &cmdline);
@@ -876,6 +876,7 @@ late_initcall(setup_arch_serial);
 static void __init setup_linux_memory(void)
 {
         unsigned long bootmap_size, low_top_pfn, kstart, kend, high_mem;
+        unsigned long physpages;
 
         kstart  = (unsigned long) &__kernel_image_start - PAGE_OFFSET;
         kend    = (unsigned long) &__kernel_image_end - PAGE_OFFSET;
@@ -893,19 +894,19 @@ static void __init setup_linux_memory(void)
                                          );
 
         /* pass the memory that the kernel can immediately use over to the bootmem allocator */
-        max_mapnr = num_physpages = (memory_end - memory_start) >> PAGE_SHIFT;
+        max_mapnr = physpages = (memory_end - memory_start) >> PAGE_SHIFT;
         low_top_pfn = (KERNEL_LOWMEM_END - KERNEL_LOWMEM_START) >> PAGE_SHIFT;
         high_mem = 0;
 
-        if (num_physpages > low_top_pfn) {
+        if (physpages > low_top_pfn) {
 #ifdef CONFIG_HIGHMEM
-                high_mem = num_physpages - low_top_pfn;
+                high_mem = physpages - low_top_pfn;
 #else
-                max_mapnr = num_physpages = low_top_pfn;
+                max_mapnr = physpages = low_top_pfn;
 #endif
         }
         else {
-                low_top_pfn = num_physpages;
+                low_top_pfn = physpages;
         }
 
         min_low_pfn = memory_start >> PAGE_SHIFT;
@@ -979,7 +980,7 @@ static void __init setup_uclinux_memory(void)
         free_bootmem(memory_start, memory_end - memory_start);
 
         high_memory = (void *) (memory_end & PAGE_MASK);
-        max_mapnr = num_physpages = ((unsigned long) high_memory - PAGE_OFFSET) >> PAGE_SHIFT;
+        max_mapnr = ((unsigned long) high_memory - PAGE_OFFSET) >> PAGE_SHIFT;
 
         min_low_pfn = memory_start >> PAGE_SHIFT;
         max_low_pfn = memory_end >> PAGE_SHIFT;
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 4bff48c19d29..a6d105d61b26 100644
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -523,7 +523,7 @@ void die_if_kernel(const char *str, ...)
                 return;
 
         va_start(va, str);
-        vsprintf(buffer, str, va);
+        vsnprintf(buffer, sizeof(buffer), str, va);
         va_end(va);
 
         console_verbose();
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index dee354fa6b64..88a159743528 100644
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -78,7 +78,7 @@ void __init paging_init(void)
         memset((void *) empty_zero_page, 0, PAGE_SIZE);
 
 #ifdef CONFIG_HIGHMEM
-        if (num_physpages - num_mappedpages) {
+        if (get_num_physpages() - num_mappedpages) {
                 pgd_t *pge;
                 pud_t *pue;
                 pmd_t *pme;
@@ -96,7 +96,7 @@ void __init paging_init(void)
          */
         zones_size[ZONE_NORMAL]  = max_low_pfn - min_low_pfn;
 #ifdef CONFIG_HIGHMEM
-        zones_size[ZONE_HIGHMEM] = num_physpages - num_mappedpages;
+        zones_size[ZONE_HIGHMEM] = get_num_physpages() - num_mappedpages;
 #endif
 
         free_area_init(zones_size);
@@ -114,45 +114,24 @@ void __init paging_init(void)
  */
 void __init mem_init(void)
 {
-        unsigned long npages = (memory_end - memory_start) >> PAGE_SHIFT;
-        unsigned long tmp;
-#ifdef CONFIG_MMU
-        unsigned long loop, pfn;
-        int datapages = 0;
-#endif
-        int codek = 0, datak = 0;
+        unsigned long code_size = _etext - _stext;
 
         /* this will put all low memory onto the freelists */
-        totalram_pages = free_all_bootmem();
-
-#ifdef CONFIG_MMU
-        for (loop = 0 ; loop < npages ; loop++)
-                if (PageReserved(&mem_map[loop]))
-                        datapages++;
-
-#ifdef CONFIG_HIGHMEM
-        for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--)
-                free_highmem_page(&mem_map[pfn]);
-#endif
-
-        codek = ((unsigned long) &_etext - (unsigned long) &_stext) >> 10;
-        datak = datapages << (PAGE_SHIFT - 10);
-
-#else
-        codek = (_etext - _stext) >> 10;
-        datak = 0; //(__bss_stop - _sdata) >> 10;
+        free_all_bootmem();
+#if defined(CONFIG_MMU) && defined(CONFIG_HIGHMEM)
+        {
+                unsigned long pfn;
+
+                for (pfn = get_num_physpages() - 1;
+                     pfn >= num_mappedpages; pfn--)
+                        free_highmem_page(&mem_map[pfn]);
+        }
 #endif
 
-        tmp = nr_free_pages() << PAGE_SHIFT;
-        printk("Memory available: %luKiB/%luKiB RAM, %luKiB/%luKiB ROM (%dKiB kernel code, %dKiB data)\n",
-               tmp >> 10,
-               npages << (PAGE_SHIFT - 10),
-               (rom_length > 0) ? ((rom_length >> 10) - codek) : 0,
-               rom_length >> 10,
-               codek,
-               datak
-               );
-
+        mem_init_print_info(NULL);
+        if (rom_length > 0 && rom_length >= code_size)
+                printk("Memory available:  %luKiB/%luKiB ROM\n",
+                        (rom_length - code_size) >> 10, rom_length >> 10);
 } /* end mem_init() */
 
 /*****************************************************************************/
@@ -162,7 +141,7 @@ void __init mem_init(void)
 void free_initmem(void)
 {
 #if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
-        free_initmem_default(0);
+        free_initmem_default(-1);
 #endif
 } /* end free_initmem() */
 
@@ -173,6 +152,6 @@ void free_initmem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_reserved_area(start, end, 0, "initrd");
+        free_reserved_area((void *)start, (void *)end, -1, "initrd");
 } /* end free_initrd_mem() */
 #endif