Merge remote-tracking branch 'linus/master' into testing

8 files changed, 21 insertions, 80 deletions

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index bcd17b206571..29a7ef4e448b 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -16,6 +16,7 @@ config M32R
         select GENERIC_ATOMIC64
         select ARCH_USES_GETTIMEOFFSET
         select MODULES_USE_ELF_RELA
+        select HAVE_DEBUG_STACKOVERFLOW
 
 config SBUS
         bool
diff --git a/arch/m32r/Kconfig.debug b/arch/m32r/Kconfig.debug
index bb1afc1a31cc..6c612b7691b0 100644
--- a/arch/m32r/Kconfig.debug
+++ b/arch/m32r/Kconfig.debug
@@ -2,13 +2,6 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
-config DEBUG_STACKOVERFLOW
-        bool "Check for stack overflows"
-        depends on DEBUG_KERNEL
-        help
-          This option will cause messages to be printed if free stack space
-          drops below a certain limit.
-
 config DEBUG_PAGEALLOC
         bool "Debug page memory allocations"
         depends on DEBUG_KERNEL && BROKEN
diff --git a/arch/m32r/include/asm/pgtable.h b/arch/m32r/include/asm/pgtable.h
index 8a28cfea2729..103ce6710f07 100644
--- a/arch/m32r/include/asm/pgtable.h
+++ b/arch/m32r/include/asm/pgtable.h
@@ -347,9 +347,6 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
 /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
 #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/m32r/include/asm/uaccess.h b/arch/m32r/include/asm/uaccess.h
index 1c7047bea200..84fe7ba53035 100644
--- a/arch/m32r/include/asm/uaccess.h
+++ b/arch/m32r/include/asm/uaccess.h
@@ -216,7 +216,7 @@ extern int fixup_exception(struct pt_regs *regs);
 ({                                                                      \
         long __gu_err = 0;                                              \
         unsigned long __gu_val;                                         \
-        might_sleep();                                                  \
+        might_fault();                                                  \
         __get_user_size(__gu_val,(ptr),(size),__gu_err);                \
         (x) = (__typeof__(*(ptr)))__gu_val;                             \
         __gu_err;                                                       \
@@ -227,7 +227,7 @@ extern int fixup_exception(struct pt_regs *regs);
         long __gu_err = -EFAULT;                                        \
         unsigned long __gu_val = 0;                                     \
         const __typeof__(*(ptr)) __user *__gu_addr = (ptr);             \
-        might_sleep();                                                  \
+        might_fault();                                                  \
         if (access_ok(VERIFY_READ,__gu_addr,size))                      \
                 __get_user_size(__gu_val,__gu_addr,(size),__gu_err);    \
         (x) = (__typeof__(*(ptr)))__gu_val;                             \
@@ -295,7 +295,7 @@ do {									\
 #define __put_user_nocheck(x,ptr,size)                                  \
 ({                                                                      \
         long __pu_err;                                                  \
-        might_sleep();                                                  \
+        might_fault();                                                  \
         __put_user_size((x),(ptr),(size),__pu_err);                     \
         __pu_err;                                                       \
 })
@@ -305,7 +305,7 @@ do {									\
 ({                                                                      \
         long __pu_err = -EFAULT;                                        \
         __typeof__(*(ptr)) __user *__pu_addr = (ptr);                   \
-        might_sleep();                                                  \
+        might_fault();                                                  \
         if (access_ok(VERIFY_WRITE,__pu_addr,size))                     \
                 __put_user_size((x),__pu_addr,(size),__pu_err);         \
         __pu_err;                                                       \
@@ -597,7 +597,7 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon
  */
 #define copy_to_user(to,from,n)                         \
 ({                                                      \
-        might_sleep();                                  \
+        might_fault();                                  \
         __generic_copy_to_user((to),(from),(n));        \
 })
 
@@ -638,7 +638,7 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon
  */
 #define copy_from_user(to,from,n)                       \
 ({                                                      \
-        might_sleep();                                  \
+        might_fault();                                  \
         __generic_copy_from_user((to),(from),(n));      \
 })
 
diff --git a/arch/m32r/include/uapi/asm/socket.h b/arch/m32r/include/uapi/asm/socket.h
index 2a3b59e0e171..24be7c8da86a 100644
--- a/arch/m32r/include/uapi/asm/socket.h
+++ b/arch/m32r/include/uapi/asm/socket.h
@@ -74,4 +74,6 @@
 
 #define SO_SELECT_ERR_QUEUE     45
 
+#define SO_BUSY_POLL            46
+
 #endif /* _ASM_M32R_SOCKET_H */
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index 0ac558adc605..bb21f4f63170 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -343,7 +343,7 @@ static void __init do_boot_cpu(int phys_id)
         }
 }
 
-int __cpuinit __cpu_up(unsigned int cpu_id, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu_id, struct task_struct *tidle)
 {
         int timeout;
 
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c
index 2c468e8b5853..27196303ce36 100644
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
@@ -129,11 +129,10 @@ unsigned long __init setup_memory(void)
 #define START_PFN(nid)          (NODE_DATA(nid)->bdata->node_min_pfn)
 #define MAX_LOW_PFN(nid)        (NODE_DATA(nid)->bdata->node_low_pfn)
 
-unsigned long __init zone_sizes_init(void)
+void __init zone_sizes_init(void)
 {
         unsigned long zones_size[MAX_NR_ZONES], zholes_size[MAX_NR_ZONES];
         unsigned long low, start_pfn;
-        unsigned long holes = 0;
         int nid, i;
         mem_prof_t *mp;
 
@@ -147,7 +146,6 @@ unsigned long __init zone_sizes_init(void)
                 low = MAX_LOW_PFN(nid);
                 zones_size[ZONE_DMA] = low - start_pfn;
                 zholes_size[ZONE_DMA] = mp->holes;
-                holes += zholes_size[ZONE_DMA];
 
                 node_set_state(nid, N_NORMAL_MEMORY);
                 free_area_init_node(nid, zones_size, start_pfn, zholes_size);
@@ -161,6 +159,4 @@ unsigned long __init zone_sizes_init(void)
         NODE_DATA(1)->node_zones->watermark[WMARK_MIN] = 0;
         NODE_DATA(1)->node_zones->watermark[WMARK_LOW] = 0;
         NODE_DATA(1)->node_zones->watermark[WMARK_HIGH] = 0;
-
-        return holes;
 }
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c
index ab4cbce91a9b..0d4146f644dc 100644
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
@@ -40,7 +40,6 @@ unsigned long mmu_context_cache_dat;
 #else
 unsigned long mmu_context_cache_dat[NR_CPUS];
 #endif
-static unsigned long hole_pages;
 
 /*
  * function prototype
@@ -57,7 +56,7 @@ void free_initrd_mem(unsigned long, unsigned long);
 #define MAX_LOW_PFN(nid)        (NODE_DATA(nid)->bdata->node_low_pfn)
 
 #ifndef CONFIG_DISCONTIGMEM
-unsigned long __init zone_sizes_init(void)
+void __init zone_sizes_init(void)
 {
         unsigned long  zones_size[MAX_NR_ZONES] = {0, };
         unsigned long  max_dma;
@@ -83,11 +82,9 @@ unsigned long __init zone_sizes_init(void)
 #endif /* CONFIG_MMU */
 
         free_area_init_node(0, zones_size, start_pfn, 0);
-
-        return 0;
 }
 #else   /* CONFIG_DISCONTIGMEM */
-extern unsigned long zone_sizes_init(void);
+extern void zone_sizes_init(void);
 #endif  /* CONFIG_DISCONTIGMEM */
 
 /*======================================================================*
@@ -105,24 +102,7 @@ void __init paging_init(void)
         for (i = 0 ; i < USER_PTRS_PER_PGD * 2 ; i++)
                 pgd_val(pg_dir[i]) = 0;
 #endif /* CONFIG_MMU */
-        hole_pages = zone_sizes_init();
-}
-
-int __init reservedpages_count(void)
-{
-        int reservedpages, nid, i;
-
-        reservedpages = 0;
-        for_each_online_node(nid) {
-                unsigned long flags;
-                pgdat_resize_lock(NODE_DATA(nid), &flags);
-                for (i = 0 ; i < MAX_LOW_PFN(nid) - START_PFN(nid) ; i++)
-                        if (PageReserved(nid_page_nr(nid, i)))
-                                reservedpages++;
-                pgdat_resize_unlock(NODE_DATA(nid), &flags);
-        }
-
-        return reservedpages;
+        zone_sizes_init();
 }
 
 /*======================================================================*
@@ -131,48 +111,20 @@ int __init reservedpages_count(void)
  *======================================================================*/
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
-        int nid;
 #ifndef CONFIG_MMU
         extern unsigned long memory_end;
-#endif
-
-        num_physpages = 0;
-        for_each_online_node(nid)
-                num_physpages += MAX_LOW_PFN(nid) - START_PFN(nid) + 1;
-
-        num_physpages -= hole_pages;
 
-#ifndef CONFIG_DISCONTIGMEM
-        max_mapnr = num_physpages;
-#endif  /* CONFIG_DISCONTIGMEM */
-
-#ifdef CONFIG_MMU
-        high_memory = (void *)__va(PFN_PHYS(MAX_LOW_PFN(0)));
-#else
         high_memory = (void *)(memory_end & PAGE_MASK);
+#else
+        high_memory = (void *)__va(PFN_PHYS(MAX_LOW_PFN(0)));
 #endif /* CONFIG_MMU */
 
         /* clear the zero-page */
         memset(empty_zero_page, 0, PAGE_SIZE);
 
-        /* this will put all low memory onto the freelists */
-        for_each_online_node(nid)
-                totalram_pages += free_all_bootmem_node(NODE_DATA(nid));
-
-        reservedpages = reservedpages_count() - hole_pages;
-        codesize = (unsigned long) &_etext - (unsigned long)&_text;
-        datasize = (unsigned long) &_edata - (unsigned long)&_etext;
-        initsize = (unsigned long) &__init_end - (unsigned long)&__init_begin;
-
-        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-                "%dk reserved, %dk data, %dk init)\n",
-                nr_free_pages() << (PAGE_SHIFT-10),
-                num_physpages << (PAGE_SHIFT-10),
-                codesize >> 10,
-                reservedpages << (PAGE_SHIFT-10),
-                datasize >> 10,
-                initsize >> 10);
+        set_max_mapnr(get_num_physpages());
+        free_all_bootmem();
+        mem_init_print_info(NULL);
 }
 
 /*======================================================================*
@@ -181,7 +133,7 @@ void __init mem_init(void)
  *======================================================================*/
 void free_initmem(void)
 {
-        free_initmem_default(0);
+        free_initmem_default(-1);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -191,6 +143,6 @@ void free_initmem(void)
  *======================================================================*/
 void 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");
 }
 #endif