9 files changed, 94 insertions, 98 deletions

diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index d999398928bc..ad754b4411f7 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -90,7 +90,7 @@ suffix-$(CONFIG_KERNEL_LZO) 	:= lzo
 suffix-$(CONFIG_KERNEL_LZ4)     := lz4
 
 RUN_SIZE = $(shell $(OBJDUMP) -h vmlinux | \
-             perl $(srctree)/arch/x86/tools/calc_run_size.pl)
+             $(CONFIG_SHELL) $(srctree)/arch/x86/tools/calc_run_size.sh)
 quiet_cmd_mkpiggy = MKPIGGY $@
       cmd_mkpiggy = $(obj)/mkpiggy $< $(RUN_SIZE) > $@ || ( rm -f $@ ; false )
 
diff --git a/arch/x86/tools/calc_run_size.pl b/arch/x86/tools/calc_run_size.pl
deleted file mode 100644
index 23210baade2d..000000000000
--- a/arch/x86/tools/calc_run_size.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl
-#
-# Calculate the amount of space needed to run the kernel, including room for
-# the .bss and .brk sections.
-#
-# Usage:
-# objdump -h a.out | perl calc_run_size.pl
-use strict;
-
-my $mem_size = 0;
-my $file_offset = 0;
-
-my $sections=" *[0-9]+ \.(?:bss|brk) +";
-while (<>) {
-        if (/^$sections([0-9a-f]+) +(?:[0-9a-f]+ +){2}([0-9a-f]+)/) {
-                my $size = hex($1);
-                my $offset = hex($2);
-                $mem_size += $size;
-                if ($file_offset == 0) {
-                        $file_offset = $offset;
-                } elsif ($file_offset != $offset) {
-                        # BFD linker shows the same file offset in ELF.
-                        # Gold linker shows them as consecutive.
-                        next if ($file_offset + $mem_size == $offset + $size);
-
-                        printf STDERR "file_offset: 0x%lx\n", $file_offset;
-                        printf STDERR "mem_size: 0x%lx\n", $mem_size;
-                        printf STDERR "offset: 0x%lx\n", $offset;
-                        printf STDERR "size: 0x%lx\n", $size;
-
-                        die ".bss and .brk are non-contiguous\n";
-                }
-        }
-}
-
-if ($file_offset == 0) {
-        die "Never found .bss or .brk file offset\n";
-}
-printf("%d\n", $mem_size + $file_offset);
diff --git a/arch/x86/tools/calc_run_size.sh b/arch/x86/tools/calc_run_size.sh
new file mode 100644
index 000000000000..1a4c17bb3910
--- /dev/null
+++ b/arch/x86/tools/calc_run_size.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# Calculate the amount of space needed to run the kernel, including room for
+# the .bss and .brk sections.
+#
+# Usage:
+# objdump -h a.out | sh calc_run_size.sh
+
+NUM='\([0-9a-fA-F]*[ \t]*\)'
+OUT=$(sed -n 's/^[ \t0-9]*.b[sr][sk][ \t]*'"$NUM$NUM$NUM$NUM"'.*/\1\4/p')
+if [ -z "$OUT" ] ; then
+        echo "Never found .bss or .brk file offset" >&2
+        exit 1
+fi
+
+OUT=$(echo ${OUT# })
+sizeA=$(printf "%d" 0x${OUT%% *})
+OUT=${OUT#* }
+offsetA=$(printf "%d" 0x${OUT%% *})
+OUT=${OUT#* }
+sizeB=$(printf "%d" 0x${OUT%% *})
+OUT=${OUT#* }
+offsetB=$(printf "%d" 0x${OUT%% *})
+
+run_size=$(( $offsetA + $sizeA + $sizeB ))
+
+# BFD linker shows the same file offset in ELF.
+if [ "$offsetA" -ne "$offsetB" ] ; then
+        # Gold linker shows them as consecutive.
+        endB=$(( $offsetB + $sizeB ))
+        if [ "$endB" != "$run_size" ] ; then
+                printf "sizeA: 0x%x\n" $sizeA >&2
+                printf "offsetA: 0x%x\n" $offsetA >&2
+                printf "sizeB: 0x%x\n" $sizeB >&2
+                printf "offsetB: 0x%x\n" $offsetB >&2
+                echo ".bss and .brk are non-contiguous" >&2
+                exit 1
+        fi
+fi
+
+printf "%d\n" $run_size
+exit 0
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index b5e7c4670205..89ac1d5083c6 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -832,6 +832,7 @@ static SIMPLE_DEV_PM_OPS(s5m_rtc_pm_ops, s5m_rtc_suspend, s5m_rtc_resume);
 static const struct platform_device_id s5m_rtc_id[] = {
         { "s5m-rtc",            S5M8767X },
         { "s2mps14-rtc",        S2MPS14X },
+        { },
 };
 
 static struct platform_driver s5m_rtc_driver = {
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 853698c721f7..76200984d1e2 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -85,11 +85,6 @@ static inline void oom_killer_enable(void)
         oom_killer_disabled = false;
 }
 
-static inline bool oom_gfp_allowed(gfp_t gfp_mask)
-{
-        return (gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY);
-}
-
 extern struct task_struct *find_lock_task_mm(struct task_struct *p);
 
 static inline bool task_will_free_mem(struct task_struct *task)
diff --git a/include/linux/printk.h b/include/linux/printk.h
index c8f170324e64..4d5bf5726578 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -10,9 +10,6 @@
 extern const char linux_banner[];
 extern const char linux_proc_banner[];
 
-extern char *log_buf_addr_get(void);
-extern u32 log_buf_len_get(void);
-
 static inline int printk_get_level(const char *buffer)
 {
         if (buffer[0] == KERN_SOH_ASCII && buffer[1]) {
@@ -163,6 +160,8 @@ extern int kptr_restrict;
 
 extern void wake_up_klogd(void);
 
+char *log_buf_addr_get(void);
+u32 log_buf_len_get(void);
 void log_buf_kexec_setup(void);
 void __init setup_log_buf(int early);
 void dump_stack_set_arch_desc(const char *fmt, ...);
@@ -198,6 +197,16 @@ static inline void wake_up_klogd(void)
 {
 }
 
+static inline char *log_buf_addr_get(void)
+{
+        return NULL;
+}
+
+static inline u32 log_buf_len_get(void)
+{
+        return 0;
+}
+
 static inline void log_buf_kexec_setup(void)
 {
 }
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 851924fa5170..683b4782019b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1477,9 +1477,9 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
 
         pr_info("Task in ");
         pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id));
-        pr_info(" killed as a result of limit of ");
+        pr_cont(" killed as a result of limit of ");
         pr_cont_cgroup_path(memcg->css.cgroup);
-        pr_info("\n");
+        pr_cont("\n");
 
         rcu_read_unlock();
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7633c503a116..8e20f9c2fa5a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2332,12 +2332,21 @@ static inline struct page *
 __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
         struct zonelist *zonelist, enum zone_type high_zoneidx,
         nodemask_t *nodemask, struct zone *preferred_zone,
-        int classzone_idx, int migratetype)
+        int classzone_idx, int migratetype, unsigned long *did_some_progress)
 {
         struct page *page;
 
-        /* Acquire the per-zone oom lock for each zone */
+        *did_some_progress = 0;
+
+        if (oom_killer_disabled)
+                return NULL;
+
+        /*