Merge branch 'akpm' (patches from Andrew Morton)

Merge misc fixes from Andrew Morton:
 "Six fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers/rtc/rtc-s5m.c: terminate s5m_rtc_id array with empty element
  printk: add dummy routine for when CONFIG_PRINTK=n
  mm/vmscan: fix highidx argument type
  memcg: remove extra newlines from memcg oom kill log
  x86, build: replace Perl script with Shell script
  mm: page_alloc: embed OOM killing naturally into allocation slowpath

1 files changed, 2 insertions, 2 deletions

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();