Commit 4ecd4ff5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 966859b9 61e8d462

arch/um/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -59,10 +59,14 @@ KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um 
# Same things for in6addr_loopback and mktime - found in libc. For these two we

# only get link-time error, luckily.

#

# -Dlongjmp=kernel_longjmp prevents anything from referencing the libpthread.a

# embedded copy of longjmp, same thing for setjmp.

#

# These apply to USER_CFLAGS to.



KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \

	$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap	\

	-Dlongjmp=kernel_longjmp -Dsetjmp=kernel_setjmp \

	-Din6addr_loopback=kernel_in6addr_loopback \

	-Din6addr_any=kernel_in6addr_any -Dstrrchr=kernel_strrchr

arch/um/drivers/stdio_console.c

+3 −0
Original line number Diff line number Diff line
@@ -192,6 +192,9 @@ __uml_exitcall(console_exit); 


static int console_chan_setup(char *str)

{

	if (!strncmp(str, "sole=", 5))	/* console= option specifies tty */

		return 0;



	line_setup(vt_conf, MAX_TTYS, &def_conf, str, "console");

	return 1;

}

arch/um/include/asm/common.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  PROVIDE (_unprotected_end = .);



  . = ALIGN(4096);

  .note : { *(.note.*) }

  NOTES

  EXCEPTION_TABLE(0)



  BUG_TABLE

arch/um/include/asm/io.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#ifndef _ASM_UM_IO_H

#define _ASM_UM_IO_H



#define ioremap ioremap

static inline void __iomem *ioremap(phys_addr_t offset, size_t size)

{

	return (void __iomem *)(unsigned long)offset;

}



#define iounmap iounmap

static inline void iounmap(void __iomem *addr)

{

}



#include <asm-generic/io.h>



#endif

arch/um/include/shared/os.h

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ extern void setup_hostinfo(char *buf, int len); 
extern void os_dump_core(void) __attribute__ ((noreturn));

extern void um_early_printk(const char *s, unsigned int n);

extern void os_fix_helper_signals(void);

extern void os_info(const char *fmt, ...)

	__attribute__ ((format (printf, 1, 2)));

extern void os_warn(const char *fmt, ...)

	__attribute__ ((format (printf, 1, 2)));



/* time.c */

extern void os_idle_sleep(unsigned long long nsecs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE