Merge tag 'Smack-for-v5.12' of git://github.com/cschaufler/smack-next

[linux-2.6-microblaze.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index b8bbfd3..baf67e7 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -33,38 +33,6 @@ config HOTPLUG_SMT
 config GENERIC_ENTRY
        bool
 
-config OPROFILE
-       tristate "OProfile system profiling"
-       depends on PROFILING
-       depends on HAVE_OPROFILE
-       select RING_BUFFER
-       select RING_BUFFER_ALLOW_SWAP
-       help
-         OProfile is a profiling system capable of profiling the
-         whole system, include the kernel, kernel modules, libraries,
-         and applications.
-
-         If unsure, say N.
-
-config OPROFILE_EVENT_MULTIPLEX
-       bool "OProfile multiplexing support (EXPERIMENTAL)"
-       default n
-       depends on OPROFILE && X86
-       help
-         The number of hardware counters is limited. The multiplexing
-         feature enables OProfile to gather more events than counters
-         are provided by the hardware. This is realized by switching
-         between events at a user specified time interval.
-
-         If unsure, say N.
-
-config HAVE_OPROFILE
-       bool
-
-config OPROFILE_NMI_TIMER
-       def_bool y
-       depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !PPC64
-
 config KPROBES
        bool "Kprobes"
        depends on MODULES
@@ -327,6 +295,10 @@ config ARCH_32BIT_OFF_T
          still support 32-bit off_t. This option is enabled for all such
          architectures explicitly.
 
+# Selected by 64 bit architectures which have a 32 bit f_tinode in struct ustat
+config ARCH_32BIT_USTAT_F_TINODE
+       bool
+
 config HAVE_ASM_MODVERSIONS
        bool
        help
@@ -1090,6 +1062,15 @@ config HAVE_STATIC_CALL_INLINE
        bool
        depends on HAVE_STATIC_CALL
 
+config HAVE_PREEMPT_DYNAMIC
+       bool
+       depends on HAVE_STATIC_CALL
+       depends on GENERIC_ENTRY
+       help
+          Select this if the architecture support boot time preempt setting
+          on top of static calls. It is strongly advised to support inline
+          static call to avoid any overhead.
+
 config ARCH_WANT_LD_ORPHAN_WARN
        bool
        help