ia64/xen-unstable

changeset 4762:7705c55a6f69

bitkeeper revision 1.1389.5.12 (4278fd8aAcM8aY0Is5jjOrEXTe74tQ)

Clean up Kconfig configuration files.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed May 04 16:51:22 2005 +0000 (2005-05-04)
parents 87b6c8e69c79
children fa155c185fd6
files linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Wed May 04 16:50:49 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Wed May 04 16:51:22 2005 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6  # Linux kernel version: 2.6.11-xen0
     1.7 -# Tue May  3 13:25:48 2005
     1.8 +# Wed May  4 17:11:56 2005
     1.9  #
    1.10  CONFIG_XEN=y
    1.11  CONFIG_ARCH_XEN=y
    1.12 @@ -146,7 +146,7 @@ CONFIG_PCI=y
    1.13  # CONFIG_PCI_GOMMCONFIG is not set
    1.14  # CONFIG_PCI_GODIRECT is not set
    1.15  CONFIG_PCI_GOANY=y
    1.16 -CONFIG_PCI_BIOS=y
    1.17 +# CONFIG_PCI_BIOS is not set
    1.18  CONFIG_PCI_DIRECT=y
    1.19  # CONFIG_PCIEPORTBUS is not set
    1.20  # CONFIG_PCI_MSI is not set
    1.21 @@ -176,16 +176,22 @@ CONFIG_PCMCIA_PROBE=y
    1.22  # Kernel hacking
    1.23  #
    1.24  CONFIG_DEBUG_KERNEL=y
    1.25 +CONFIG_MAGIC_SYSRQ=y
    1.26 +# CONFIG_SCHEDSTATS is not set
    1.27 +# CONFIG_DEBUG_SLAB is not set
    1.28 +# CONFIG_DEBUG_PREEMPT is not set
    1.29 +# CONFIG_DEBUG_SPINLOCK is not set
    1.30 +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    1.31 +# CONFIG_DEBUG_KOBJECT is not set
    1.32 +CONFIG_DEBUG_BUGVERBOSE=y
    1.33 +# CONFIG_DEBUG_INFO is not set
    1.34 +# CONFIG_DEBUG_FS is not set
    1.35 +# CONFIG_FRAME_POINTER is not set
    1.36  CONFIG_EARLY_PRINTK=y
    1.37  # CONFIG_DEBUG_STACKOVERFLOW is not set
    1.38 +# CONFIG_KPROBES is not set
    1.39  # CONFIG_DEBUG_STACK_USAGE is not set
    1.40 -# CONFIG_DEBUG_SLAB is not set
    1.41 -CONFIG_MAGIC_SYSRQ=y
    1.42 -# CONFIG_DEBUG_SPINLOCK is not set
    1.43  # CONFIG_DEBUG_PAGEALLOC is not set
    1.44 -# CONFIG_DEBUG_INFO is not set
    1.45 -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    1.46 -# CONFIG_FRAME_POINTER is not set
    1.47  # CONFIG_4KSTACKS is not set
    1.48  CONFIG_X86_FIND_SMP_CONFIG=y
    1.49  CONFIG_X86_MPPARSE=y
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Wed May 04 16:50:49 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Wed May 04 16:51:22 2005 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6  # Linux kernel version: 2.6.11-xenU
     2.7 -# Wed Apr  6 09:20:09 2005
     2.8 +# Wed May  4 17:14:10 2005
     2.9  #
    2.10  CONFIG_XEN=y
    2.11  CONFIG_ARCH_XEN=y
    2.12 @@ -132,16 +132,22 @@ CONFIG_HAVE_DEC_LOCK=y
    2.13  # Kernel hacking
    2.14  #
    2.15  CONFIG_DEBUG_KERNEL=y
    2.16 +CONFIG_MAGIC_SYSRQ=y
    2.17 +# CONFIG_SCHEDSTATS is not set
    2.18 +# CONFIG_DEBUG_SLAB is not set
    2.19 +# CONFIG_DEBUG_PREEMPT is not set
    2.20 +# CONFIG_DEBUG_SPINLOCK is not set
    2.21 +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    2.22 +# CONFIG_DEBUG_KOBJECT is not set
    2.23 +CONFIG_DEBUG_BUGVERBOSE=y
    2.24 +# CONFIG_DEBUG_INFO is not set
    2.25 +# CONFIG_DEBUG_FS is not set
    2.26 +# CONFIG_FRAME_POINTER is not set
    2.27  CONFIG_EARLY_PRINTK=y
    2.28  # CONFIG_DEBUG_STACKOVERFLOW is not set
    2.29 +# CONFIG_KPROBES is not set
    2.30  # CONFIG_DEBUG_STACK_USAGE is not set
    2.31 -# CONFIG_DEBUG_SLAB is not set
    2.32 -CONFIG_MAGIC_SYSRQ=y
    2.33 -# CONFIG_DEBUG_SPINLOCK is not set
    2.34  # CONFIG_DEBUG_PAGEALLOC is not set
    2.35 -# CONFIG_DEBUG_INFO is not set
    2.36 -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    2.37 -# CONFIG_FRAME_POINTER is not set
    2.38  # CONFIG_4KSTACKS is not set
    2.39  CONFIG_GENERIC_HARDIRQS=y
    2.40  CONFIG_GENERIC_IRQ_PROBE=y
     3.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig	Wed May 04 16:50:49 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig	Wed May 04 16:51:22 2005 +0000
     3.3 @@ -12,6 +12,11 @@ config XENARCH
     3.4  config X86
     3.5  	bool
     3.6  	default y
     3.7 +	help
     3.8 +	  This is Linux's home port.  Linux was originally native to the Intel
     3.9 +	  386, and runs on all the later x86 processors including the Intel
    3.10 +	  486, 586, Pentiums, and various instruction-set-compatible chips by
    3.11 +	  AMD, Cyrix, and others.
    3.12  
    3.13  config MMU
    3.14  	bool
    3.15 @@ -772,13 +777,19 @@ endchoice
    3.16  config PCI_BIOS
    3.17  	bool
    3.18  	depends on !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY)
    3.19 -	default n
    3.20 +	default y
    3.21  
    3.22  config PCI_DIRECT
    3.23  	bool
    3.24   	depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
    3.25  	default y
    3.26  
    3.27 +config PCI_MMCONFIG
    3.28 +	bool
    3.29 +	depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI))
    3.30 +	select ACPI_BOOT
    3.31 +	default y
    3.32 +
    3.33  source "drivers/pci/pcie/Kconfig"
    3.34  
    3.35  source "drivers/pci/Kconfig"
    3.36 @@ -846,129 +857,7 @@ endmenu
    3.37  
    3.38  endif
    3.39  
    3.40 -menu "Kernel hacking"
    3.41 -
    3.42 -config DEBUG_KERNEL
    3.43 -	bool "Kernel debugging"
    3.44 -	help
    3.45 -	  Say Y here if you are developing drivers or trying to debug and
    3.46 -	  identify kernel problems.
    3.47 -
    3.48 -config EARLY_PRINTK
    3.49 -	bool "Early printk" if EMBEDDED
    3.50 -	default y
    3.51 -	help
    3.52 -	  Write kernel log output directly into the VGA buffer or to a serial
    3.53 -	  port.
    3.54 -
    3.55 -	  This is useful for kernel debugging when your machine crashes very
    3.56 -	  early before the console code is initialized. For normal operation
    3.57 -	  it is not recommended because it looks ugly and doesn't cooperate
    3.58 -	  with klogd/syslogd or the X server. You should normally N here,
    3.59 -	  unless you want to debug such a crash.
    3.60 -
    3.61 -config DEBUG_STACKOVERFLOW
    3.62 -	bool "Check for stack overflows"
    3.63 -	depends on DEBUG_KERNEL
    3.64 -
    3.65 -config DEBUG_STACK_USAGE
    3.66 -	bool "Stack utilization instrumentation"
    3.67 -	depends on DEBUG_KERNEL
    3.68 -	help
    3.69 -	  Enables the display of the minimum amount of free stack which each
    3.70 -	  task has ever had available in the sysrq-T and sysrq-P debug output.
    3.71 -
    3.72 -	  This option will slow down process creation somewhat.
    3.73 -
    3.74 -config DEBUG_SLAB
    3.75 -	bool "Debug memory allocations"
    3.76 -	depends on DEBUG_KERNEL
    3.77 -	help
    3.78 -	  Say Y here to have the kernel do limited verification on memory
    3.79 -	  allocation as well as poisoning memory on free to catch use of freed
    3.80 -	  memory.
    3.81 -
    3.82 -config MAGIC_SYSRQ
    3.83 -	bool "Magic SysRq key"
    3.84 -	depends on DEBUG_KERNEL
    3.85 -	help
    3.86 -	  If you say Y here, you will have some control over the system even
    3.87 -	  if the system crashes for example during kernel debugging (e.g., you
    3.88 -	  will be able to flush the buffer cache to disk, reboot the system
    3.89 -	  immediately or dump some status information). This is accomplished
    3.90 -	  by pressing various keys while holding SysRq (Alt+PrintScreen). It
    3.91 -	  also works on a serial console (on PC hardware at least), if you
    3.92 -	  send a BREAK and then within 5 seconds a command keypress. The
    3.93 -	  keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
    3.94 -	  unless you really know what this hack does.
    3.95 -
    3.96 -config DEBUG_SPINLOCK
    3.97 -	bool "Spinlock debugging"
    3.98 -	depends on DEBUG_KERNEL
    3.99 -	help
   3.100 -	  Say Y here and build SMP to catch missing spinlock initialization
   3.101 -	  and certain other kinds of spinlock errors commonly made.  This is
   3.102 -	  best used in conjunction with the NMI watchdog so that spinlock
   3.103 -	  deadlocks are also debuggable.
   3.104 -
   3.105 -config DEBUG_PAGEALLOC
   3.106 -	bool "Page alloc debugging"
   3.107 -	depends on DEBUG_KERNEL
   3.108 -	help
   3.109 -	  Unmap pages from the kernel linear mapping after free_pages().
   3.110 -	  This results in a large slowdown, but helps to find certain types
   3.111 -	  of memory corruptions.
   3.112 -
   3.113 -config DEBUG_HIGHMEM
   3.114 -	bool "Highmem debugging"
   3.115 -	depends on DEBUG_KERNEL && HIGHMEM
   3.116 -	help
   3.117 -	  This options enables addition error checking for high memory systems.
   3.118 -	  Disable for production systems.
   3.119 -
   3.120 -config DEBUG_INFO
   3.121 -	bool "Compile the kernel with debug info"
   3.122 -	depends on DEBUG_KERNEL
   3.123 -	help
   3.124 -          If you say Y here the resulting kernel image will include
   3.125 -	  debugging info resulting in a larger kernel image.
   3.126 -	  Say Y here only if you plan to use gdb to debug the kernel.
   3.127 -	  If you don't debug the kernel, you can say N.
   3.128 -	  
   3.129 -config DEBUG_SPINLOCK_SLEEP
   3.130 -	bool "Sleep-inside-spinlock checking"
   3.131 -	help
   3.132 -	  If you say Y here, various routines which may sleep will become very
   3.133 -	  noisy if they are called with a spinlock held.	
   3.134 -
   3.135 -config FRAME_POINTER
   3.136 -	bool "Compile the kernel with frame pointers"
   3.137 -	help
   3.138 -	  If you say Y here the resulting kernel image will be slightly larger
   3.139 -	  and slower, but it will give very useful debugging information.
   3.140 -	  If you don't debug the kernel, you can say N, but we may not be able
   3.141 -	  to solve problems without frame pointers.
   3.142 -
   3.143 -config 4KSTACKS
   3.144 -	bool "Use 4Kb for kernel stacks instead of 8Kb"
   3.145 -	help
   3.146 -	  If you say Y here the kernel will use a 4Kb stacksize for the
   3.147 -	  kernel stack attached to each process/thread. This facilitates
   3.148 -	  running more threads on a system and also reduces the pressure
   3.149 -	  on the VM subsystem for higher order allocations. This option
   3.150 -	  will also use IRQ stacks to compensate for the reduced stackspace.
   3.151 -
   3.152 -config X86_FIND_SMP_CONFIG
   3.153 -	bool
   3.154 -	depends on X86_LOCAL_APIC || X86_VOYAGER
   3.155 -	default n
   3.156 -
   3.157 -config X86_MPPARSE
   3.158 -	bool
   3.159 -	depends on X86_LOCAL_APIC && !X86_VISWS
   3.160 -	default y
   3.161 -
   3.162 -endmenu
   3.163 +source "arch/i386/Kconfig.debug"
   3.164  
   3.165  #
   3.166  # Use the generic interrupt handling code in kernel/irq/: