[patch 08/10] uml: mark broken configs

[patch 08/10] uml: mark broken configs

[blaisorblade_spam]

Some configuration options are known not to compile. So then make them
depend on CONFIG_BROKEN.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---

 linux-2.6.9-current-paolo/arch/um/Kconfig       |   27 +++++++++++++-----------
 linux-2.6.9-current-paolo/arch/um/Kconfig_block |    1 
 linux-2.6.9-current-paolo/arch/um/Kconfig_net   |    2 -
 3 files changed, 17 insertions(+), 13 deletions(-)

diff -puN arch/um/Kconfig~uml-mark_broken_configs arch/um/Kconfig
--- linux-2.6.9-current/arch/um/Kconfig~uml-mark_broken_configs	2004-10-12 01:17:58.598244688 +0200
+++ linux-2.6.9-current-paolo/arch/um/Kconfig	2004-10-12 01:17:58.602244080 +0200
@@ -143,7 +143,6 @@ config SMP
         will appear to be running simultaneously.  If the host is a
         multiprocessor, then UML processes may run simultaneously, depending
         on the host scheduler.
-        CONFIG_SMP will be set to whatever this option is set to.
         It is safe to leave this unchanged.
 
 config NR_CPUS
@@ -179,6 +178,7 @@ config KERNEL_HALF_GIGS
 
 config HIGHMEM
 	bool "Highmem support"
+	depends on BROKEN
 
 config KERNEL_STACK_ORDER
 	int "Kernel stack size order"
@@ -225,23 +225,26 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-menu "SCSI support"
+if BROKEN
+	menu "SCSI support"
 
-config SCSI
-	tristate "SCSI support"
+	config SCSI
+		tristate "SCSI support"
 
 # This gives us free_dma, which scsi.c wants.
-config GENERIC_ISA_DMA
-	bool
-	depends on SCSI
-	default y
+	config GENERIC_ISA_DMA
+		bool
+		depends on SCSI
+		default y
 
-source "arch/um/Kconfig_scsi"
+	source "arch/um/Kconfig_scsi"
 
-endmenu
+	endmenu
+endif
 
 source "drivers/md/Kconfig"
 
-source "drivers/mtd/Kconfig"
-
+if BROKEN
+	source "drivers/mtd/Kconfig"
+endif
 source "arch/um/Kconfig.debug"
diff -puN arch/um/Kconfig_block~uml-mark_broken_configs arch/um/Kconfig_block
--- linux-2.6.9-current/arch/um/Kconfig_block~uml-mark_broken_configs	2004-10-12 01:17:58.599244536 +0200
+++ linux-2.6.9-current-paolo/arch/um/Kconfig_block	2004-10-12 01:17:58.602244080 +0200
@@ -54,6 +54,7 @@ config BLK_DEV_INITRD
 
 config MMAPPER
 	tristate "Example IO memory driver"
+	depends on BROKEN
 	help
         The User-Mode Linux port can provide support for IO Memory
         emulation with this option.  This allows a host file to be
diff -puN arch/um/Kconfig_net~uml-mark_broken_configs arch/um/Kconfig_net
--- linux-2.6.9-current/arch/um/Kconfig_net~uml-mark_broken_configs	2004-10-12 01:17:58.600244384 +0200
+++ linux-2.6.9-current-paolo/arch/um/Kconfig_net	2004-10-12 01:17:58.603243928 +0200
@@ -135,7 +135,7 @@ config UML_NET_MCAST
 
 config UML_NET_PCAP
 	bool "pcap transport"
-	depends on UML_NET
+	depends on UML_NET && BROKEN
 	help
 	The pcap transport makes a pcap packet stream on the host look
 	like an ethernet device inside UML.  This is useful for making 
_

Re: [patch 08/10] uml: mark broken configs

[Roman Zippel]

Hi,

On Tue, 12 Oct 2004 blaisorblade_spam@yahoo.it wrote:

> -menu "SCSI support"
> +if BROKEN
> +	menu "SCSI support"

You can add "depends on BROKEN" after the menu statement with the same 
effect.

bye, Roman