Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 23:39:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-06-04 08:03:16 +09:00
commit cb37bbd90a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm-generic/unistd.h
View File

@ -683,9 +683,11 @@ __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime)
__SYSCALL(__NR_syncfs, sys_syncfs) __SYSCALL(__NR_syncfs, sys_syncfs)
#define __NR_setns 268 #define __NR_setns 268
__SYSCALL(__NR_setns, sys_setns) __SYSCALL(__NR_setns, sys_setns)
#define __NR_sendmmsg 269
__SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)
#undef __NR_syscalls #undef __NR_syscalls
#define __NR_syscalls 269 #define __NR_syscalls 270
/* /*
* All syscalls below here should go away really, * All syscalls below here should go away really,

2
lib/Kconfig.debug
View File

@ -697,7 +697,7 @@ config DEBUG_BUGVERBOSE
bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT
depends on BUG depends on BUG
depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \ depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \
FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300 FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300 || TILE
default y default y
help help
Say Y here to make BUG() panics output the file name and line number Say Y here to make BUG() panics output the file name and line number