libata: fix probe_ent alloc/free bugs

[powerpc.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index a3f83e2..f977086 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -125,6 +125,12 @@ config IPC_NS
          environments, to use ipc namespaces to provide different ipc
          objects for different servers.  If unsure, say N.
 
          environments, to use ipc namespaces to provide different ipc
          objects for different servers.  If unsure, say N.
 

+config SYSVIPC_SYSCTL
+       bool
+       depends on SYSVIPC
+       depends on SYSCTL
+       default y
+

 config POSIX_MQUEUE
        bool "POSIX Message Queues"
        depends on NET && EXPERIMENTAL
 config POSIX_MQUEUE
        bool "POSIX Message Queues"
        depends on NET && EXPERIMENTAL


@@ -192,6 +198,24 @@ config TASK_DELAY_ACCT
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+config TASK_XACCT
+       bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
+       depends on TASKSTATS
+       help
+         Collect extended task accounting data and send the data
+         to userland for processing over the taskstats interface.
+
+         Say N if unsure.
+
+config TASK_IO_ACCOUNTING
+       bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
+       depends on TASK_XACCT
+       help
+         Collect information on the number of bytes of storage I/O which this
+         task has caused.
+
+         Say N if unsure.
+

 config UTS_NS
        bool "UTS Namespaces"
        default n
 config UTS_NS
        bool "UTS Namespaces"
        default n


@@ -280,8 +304,12 @@ config RELAY
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+if BLK_DEV_INITRD
+

 source "usr/Kconfig"
 
 source "usr/Kconfig"
 

+endif
+

 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y


@@ -295,24 +323,6 @@ config CC_OPTIMIZE_FOR_SIZE
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-config TASK_XACCT
-       bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
-       depends on TASKSTATS
-       help
-         Collect extended task accounting data and send the data
-         to userland for processing over the taskstats interface.
-
-         Say N if unsure.
-
-config TASK_IO_ACCOUNTING
-       bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
-       depends on TASK_XACCT
-       help
-         Collect information on the number of bytes of storage I/O which this
-         task has caused.
-
-         Say N if unsure.
-

 config SYSCTL
        bool
 
 config SYSCTL
        bool