Merge branch 'for-linus-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull UML updates from Richard Weinberger:
 "Mostly fixes for UML:

   - First round of fixes for PTRACE_GETRESET/SETREGSET

   - A printf vs printk cleanup

   - Minor improvements"

* 'for-linus-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Correctly check for PTRACE_GETRESET/SETREGSET
  um: v2: Use generic NOTES macro
  um: Add kerneldoc for userspace_tramp() and start_userspace()
  um: Add kerneldoc for segv_handler
  um: stub-data.h: remove superfluous include
  um: userspace - be more verbose in ptrace set regs error
  um: add dummy ioremap and iounmap functions
  um: Allow building and running on older hosts
  um: Avoid longjmp/setjmp symbol clashes with libpthread.a
  um: console: Ignore console= option
  um: Use os_warn to print out pre-boot warning/error messages
  um: Add os_warn() for pre-boot warning/error messages
  um: Use os_info for the messages on normal path
  um: Add os_info() for pre-boot information messages
  um: Use printk instead of printf in make_uml_dir

diff --combined arch/um/kernel/um_arch.c
index 7b56401173250e1dbb61208106c35c58e324812b,9c5d111f46bea8f7d5c662fceddbd7bb2eff08cd..f433690b9b377981265362858fc9727503040b5e
--- 1/arch/um/kernel/um_arch.c
--- 2/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@@ -34,7 -34,7 +34,7 @@@ static char __initdata command_line[COM
  static void __init add_arg(char *arg)
  {
        if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
-               printf("add_arg: Too many command line arguments!\n");
+               os_warn("add_arg: Too many command line arguments!\n");
                exit(1);
        }
        if (strlen(command_line) > 0)
@@@ -56,6 -56,12 +56,6 @@@ union thread_union cpu0_irqstac
        __attribute__((__section__(".data..init_irqstack"))) =
                { INIT_THREAD_INFO(init_task) };
  
 -unsigned long thread_saved_pc(struct task_struct *task)
 -{
 -      /* FIXME: Need to look up userspace_pid by cpu */
 -      return os_process_pc(userspace_pid[0]);
 -}
 -
  /* Changed in setup_arch, which is called in early boot */
  static char host_info[(__NEW_UTS_LEN + 1) * 5];
  
@@@ -120,6 -126,7 +120,7 @@@ static const char *usage_string 
  
  static int __init uml_version_setup(char *line, int *add)
  {
+       /* Explicitly use printf() to show version in stdout */
        printf("%s\n", init_utsname()->release);
        exit(0);
  
@@@ -148,8 -155,8 +149,8 @@@ __uml_setup("root=", uml_root_setup
  
  static int __init no_skas_debug_setup(char *line, int *add)
  {
-       printf("'debug' is not necessary to gdb UML in skas mode - run \n");
-       printf("'gdb linux'\n");
+       os_warn("'debug' is not necessary to gdb UML in skas mode - run\n");
+       os_warn("'gdb linux'\n");
  
        return 0;
  }
@@@ -165,6 -172,7 +166,7 @@@ static int __init Usage(char *line, in
  
        printf(usage_string, init_utsname()->release);
        p = &__uml_help_start;
+       /* Explicitly use printf() to show help in stdout */
        while (p < &__uml_help_end) {
                printf("%s", *p);
                p++;
@@@ -283,8 -291,8 +285,8 @@@ int __init linux_main(int argc, char **
  
        diff = UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
        if (diff > 1024 * 1024) {
-               printf("Adding %ld bytes to physical memory to account for "
-                      "exec-shield gap\n", diff);
+               os_info("Adding %ld bytes to physical memory to account for "
+                       "exec-shield gap\n", diff);
                physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
        }
  
@@@ -324,8 -332,8 +326,8 @@@
        end_vm = start_vm + virtmem_size;
  
        if (virtmem_size < physmem_size)
-               printf("Kernel virtual memory size shrunk to %lu bytes\n",
-                      virtmem_size);
+               os_info("Kernel virtual memory size shrunk to %lu bytes\n",
+                       virtmem_size);
  
        os_flush_stdout();