[POWERPC] Simplify the code defining the 64-bit CPU features

[powerpc.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 1d19fd2..df55b36 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,3 +1,11 @@
+config DEFCONFIG_LIST
+       string
+       option defconfig_list
+       default "/lib/modules/$UNAME_RELEASE/.config"
+       default "/etc/kernel-config"
+       default "/boot/config-$UNAME_RELEASE"
+       default "arch/$ARCH/defconfig"
+
 menu "Code maturity level options"
 
 config EXPERIMENTAL
@@ -151,7 +159,8 @@ config BSD_PROCESS_ACCT_V3
          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
 
 config SYSCTL
-       bool "Sysctl support"
+       bool "Sysctl support" if EMBEDDED
+       default y
        ---help---
          The sysctl interface provides a means of dynamically changing
          certain kernel parameters and variables on the fly without requiring
@@ -182,7 +191,8 @@ config AUDITSYSCALL
        help
          Enable low-overhead system-call auditing infrastructure that
          can be used independently or with another kernel subsystem,
-         such as SELinux.
+         such as SELinux.  To use audit's filesystem watch feature, please
+         ensure that INOTIFY is configured.
 
 config IKCONFIG
        bool "Kernel .config support"
@@ -234,16 +244,6 @@ config UID16
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
-config VM86
-       depends X86
-       default y
-       bool "Enable VM86 support" if EMBEDDED
-       help
-          This option is required by programs like DOSEMU to run 16-bit legacy
-         code on X86 processors. It also may be needed by software like
-          XFree86 to initialize some video cards via BIOS. Disabling this
-          option saves about 6k.
-
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y
@@ -365,43 +365,6 @@ config SHMEM
          option replaces shmem and tmpfs with the much simpler ramfs code,
          which may be appropriate on small systems without swap.
 
-config CC_ALIGN_FUNCTIONS
-       int "Function alignment" if EMBEDDED
-       default 0
-       help
-         Align the start of functions to the next power-of-two greater than n,
-         skipping up to n bytes.  For instance, 32 aligns functions
-         to the next 32-byte boundary, but 24 would align to the next
-         32-byte boundary only if this can be done by skipping 23 bytes or less.
-         Zero means use compiler's default.
-
-config CC_ALIGN_LABELS
-       int "Label alignment" if EMBEDDED
-       default 0
-       help
-         Align all branch targets to a power-of-two boundary, skipping
-         up to n bytes like ALIGN_FUNCTIONS.  This option can easily
-         make code slower, because it must insert dummy operations for
-         when the branch target is reached in the usual flow of the code.
-         Zero means use compiler's default.
-
-config CC_ALIGN_LOOPS
-       int "Loop alignment" if EMBEDDED
-       default 0
-       help
-         Align loops to a power-of-two boundary, skipping up to n bytes.
-         Zero means use compiler's default.
-
-config CC_ALIGN_JUMPS
-       int "Jump alignment" if EMBEDDED
-       default 0
-       help
-         Align branch targets to a power-of-two boundary, for branch
-         targets where the targets can only be reached by jumping,
-         skipping up to n bytes like ALIGN_FUNCTIONS.  In this case,
-         no dummy operations need be executed.
-         Zero means use compiler's default.
-
 config SLAB
        default y
        bool "Use full SLAB allocator" if EMBEDDED
@@ -426,9 +389,6 @@ config SLOB
        default !SLAB
        bool
 
-config OBSOLETE_INTERMODULE
-       tristate
-
 menu "Loadable module support"
 
 config MODULES
@@ -470,15 +430,6 @@ config MODULE_FORCE_UNLOAD
          rmmod).  This is mainly for kernel developers and desperate users.
          If unsure, say N.
 
-config OBSOLETE_MODPARM
-       bool
-       default y
-       depends on MODULES
-       help
-         You need this option to use module parameters on modules which
-         have not been converted to the new module parameter system yet.
-         If unsure, say Y.
-
 config MODVERSIONS
        bool "Module versioning support"
        depends on MODULES