Commit cb37bbd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  asm-generic/unistd.h: support sendmmsg syscall
  tile: enable CONFIG_BUGVERBOSE
parents 3af91a12 b36a9689

include/asm-generic/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -683,9 +683,11 @@ __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime) 
__SYSCALL(__NR_syncfs, sys_syncfs)

#define __NR_setns 268

__SYSCALL(__NR_setns, sys_setns)

#define __NR_sendmmsg 269

__SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)



#undef __NR_syscalls

#define __NR_syscalls 269

#define __NR_syscalls 270



/*

 * All syscalls below here should go away really,

lib/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ config DEBUG_BUGVERBOSE 
	bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT

	depends on BUG

	depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \

		   FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300

		   FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300 || TILE

	default y

	help

	  Say Y here to make BUG() panics output the file name and line number