diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 08:03:16 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 08:03:16 +0900 |
| commit | cb37bbd90a11003993d47c395837e0f87abf1b31 (patch) | |
| tree | 404f13b334c2c2287e4bebac845c35db70ebfe81 | |
| parent | 3af91a1256b628d55913324d27fe747c69566749 (diff) | |
| parent | b36a968927b789b2dd8de0aaf7a72ef7c1f0d012 (diff) | |
| download | linux-3.10-cb37bbd90a11003993d47c395837e0f87abf1b31.tar.gz linux-3.10-cb37bbd90a11003993d47c395837e0f87abf1b31.tar.bz2 linux-3.10-cb37bbd90a11003993d47c395837e0f87abf1b31.zip | |
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
| -rw-r--r-- | include/asm-generic/unistd.h | 4 | ||||
| -rw-r--r-- | lib/Kconfig.debug | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index ae90e0f6399..4f76959397f 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@ -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, diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 28afa4c5333..dd373c8ee94 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -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 |