Merge tag 'nfs-for-3.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 97fb7d0365d15505d500a126588f889a7647fcd8..dcd91a85536a631057cd7cabec89583b63e1f468 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -303,6 +303,13 @@ config ARCH_WANT_OLD_COMPAT_IPC
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        bool
 
+config HAVE_VIRT_TO_BUS
+       bool
+       help
+         An architecture should select this if it implements the
+         deprecated interface virt_to_bus().  All new architectures
+         should probably not select this.
+
 config HAVE_ARCH_SECCOMP_FILTER
        bool
        help
@@ -368,9 +375,6 @@ config MODULES_USE_ELF_REL
          Modules only use ELF REL relocations.  Modules with ELF RELA
          relocations will give an error.
 
-config GENERIC_SIGALTSTACK
-       bool
-
 #
 # ABI hall of shame
 #
@@ -385,4 +389,30 @@ config CLONE_BACKWARDS2
        help
          Architecture has the first two arguments of clone(2) swapped.
 
+config ODD_RT_SIGACTION
+       bool
+       help
+         Architecture has unusual rt_sigaction(2) arguments
+
+config OLD_SIGSUSPEND
+       bool
+       help
+         Architecture has old sigsuspend(2) syscall, of one-argument variety
+
+config OLD_SIGSUSPEND3
+       bool
+       help
+         Even weirder antique ABI - three-argument sigsuspend(2)
+
+config OLD_SIGACTION
+       bool
+       help
+         Architecture has old sigaction(2) syscall.  Nope, not the same
+         as OLD_SIGSUSPEND | OLD_SIGSUSPEND3 - alpha has sigsuspend(2),
+         but fairly different variant of sigaction(2), thanks to OSF/1
+         compatibility...
+
+config COMPAT_OLD_SIGACTION
+       bool
+
 source "kernel/gcov/Kconfig"