diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 14:24:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 14:24:56 -0800 |
| commit | bcc9f96681a1e272b38f16e324d4510823f85730 (patch) | |
| tree | 415bfe9058797568ea9e894dace067018ba232a2 /arch/alpha/Kconfig | |
| parent | b399c46ea0070671f3abbe1915d26076101a42f2 (diff) | |
| parent | 0ef38d70d4118b2ce1a538d14357be5ff9dc2bbd (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha updates from Matt Turner:
"A pair of changes for alpha. One fixes a networking regression, and
the second adds audit syscall support which will help in supporting
systemd"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: fix broken network checksum
alpha: Enable system-call auditing support.
Diffstat (limited to 'arch/alpha/Kconfig')
| -rw-r--r-- | arch/alpha/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 97a2d9a096b9..f6c6b345388c 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -17,6 +17,7 @@ config ALPHA select ARCH_WANT_IPC_PARSE_VERSION select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE + select AUDIT_ARCH select GENERIC_CLOCKEVENTS select GENERIC_SMP_IDLE_THREAD select GENERIC_STRNCPY_FROM_USER @@ -77,6 +78,8 @@ config GENERIC_ISA_DMA source "init/Kconfig" source "kernel/Kconfig.freezer" +config AUDIT_ARCH + bool menu "System setup" |