From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 8 Jul 2008 07:43:01 +0000 (+0200)
Subject: Merge branch 'x86/setup' into x86/devel
X-Git-Tag: v2.6.27-rc1~1106^2~250
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c1ca43fafea41e38cb2d0c1684119af4c1de547;p=linux-2.6

Merge branch 'x86/setup' into x86/devel
---

3c1ca43fafea41e38cb2d0c1684119af4c1de547
diff --cc arch/x86/Kconfig.debug
index 18363374d5,14abaa5192..38a15333f7
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -6,20 -6,24 +6,28 @@@ config TRACE_IRQFLAGS_SUPPOR
  source "lib/Kconfig.debug"
  
  config NONPROMISC_DEVMEM
 -	bool "Disable promiscuous /dev/mem"
 +	bool "Filter access to /dev/mem"
  	help
 -	  The /dev/mem file by default only allows userspace access to PCI
 -	  space and the BIOS code and data regions. This is sufficient for
 -	  dosemu and X and all common users of /dev/mem. With this config
 -	  option, you allow userspace access to all of memory, including
 -	  kernel and userspace memory. Accidental access to this is
 -	  obviously disasterous, but specific access can be used by people
 -	  debugging the kernel.
 +	  If this option is left off, you allow userspace access to all
 +	  of memory, including kernel and userspace memory. Accidental
 +	  access to this is obviously disastrous, but specific access can
 +	  be used by people debugging the kernel.
 +
 +	  If this option is switched on, the /dev/mem file only allows
 +	  userspace access to PCI space and the BIOS code and data regions.
 +	  This is sufficient for dosemu and X and all common users of
 +	  /dev/mem.
 +
 +	  If in doubt, say Y.
  
+ config X86_VERBOSE_BOOTUP
+ 	bool "Enable verbose x86 bootup info messages"
+ 	default y
+ 	help
+ 	  Enables the informational output from the decompression stage
+ 	  (e.g. bzImage) of the boot. If you disable this you will still
+ 	  see errors. Disable this if you want silent bootup.
+ 
  config EARLY_PRINTK
  	bool "Early printk" if EMBEDDED
  	default y