ia64/xen-unstable

changeset 6195:1b354b634e3f

Update x86_64 Linux kernels to add SMP to -xen and -xenU plus magic sysrq to all.

Signed-off-by: ian@xensource.com
author iap10@firebug.cl.cam.ac.uk
date Mon Aug 15 18:38:13 2005 +0000 (2005-08-15)
parents f11a31ad22d5
children 84962f30285b
files linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Mon Aug 15 15:34:23 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Mon Aug 15 18:38:13 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.12.3-xen0
     1.7 -# Mon Aug 15 11:36:25 2005
     1.8 +# Linux kernel version: 2.6.12.4-xen0
     1.9 +# Mon Aug 15 18:57:19 2005
    1.10  #
    1.11  CONFIG_XEN=y
    1.12  CONFIG_ARCH_XEN=y
    1.13 @@ -52,6 +52,7 @@ CONFIG_KOBJECT_UEVENT=y
    1.14  # CONFIG_IKCONFIG is not set
    1.15  # CONFIG_EMBEDDED is not set
    1.16  CONFIG_KALLSYMS=y
    1.17 +# CONFIG_KALLSYMS_ALL is not set
    1.18  # CONFIG_KALLSYMS_EXTRA_PASS is not set
    1.19  CONFIG_PRINTK=y
    1.20  CONFIG_BUG=y
    1.21 @@ -163,6 +164,7 @@ CONFIG_BINFMT_MISC=y
    1.22  CONFIG_STANDALONE=y
    1.23  # CONFIG_PREVENT_FIRMWARE_BUILD is not set
    1.24  # CONFIG_FW_LOADER is not set
    1.25 +# CONFIG_DEBUG_DRIVER is not set
    1.26  
    1.27  #
    1.28  # Memory Technology Devices (MTD)
    1.29 @@ -1060,7 +1062,22 @@ CONFIG_ZLIB_INFLATE=y
    1.30  # Kernel hacking
    1.31  #
    1.32  # CONFIG_PRINTK_TIME is not set
    1.33 -# CONFIG_DEBUG_KERNEL is not set
    1.34 -CONFIG_LOG_BUF_SHIFT=14
    1.35 +CONFIG_DEBUG_KERNEL=y
    1.36 +CONFIG_MAGIC_SYSRQ=y
    1.37 +CONFIG_LOG_BUF_SHIFT=15
    1.38 +# CONFIG_SCHEDSTATS is not set
    1.39 +# CONFIG_DEBUG_SLAB is not set
    1.40 +# CONFIG_DEBUG_SPINLOCK is not set
    1.41 +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    1.42 +# CONFIG_DEBUG_KOBJECT is not set
    1.43 +# CONFIG_DEBUG_INFO is not set
    1.44 +# CONFIG_DEBUG_FS is not set
    1.45 +# CONFIG_DEBUG_STACKOVERFLOW is not set
    1.46 +# CONFIG_KPROBES is not set
    1.47 +# CONFIG_DEBUG_STACK_USAGE is not set
    1.48 +# CONFIG_DEBUG_PAGEALLOC is not set
    1.49 +# CONFIG_4KSTACKS is not set
    1.50  CONFIG_X86_FIND_SMP_CONFIG=y
    1.51  CONFIG_X86_MPPARSE=y
    1.52 +# CONFIG_CHECKING is not set
    1.53 +# CONFIG_INIT_DEBUG is not set
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Mon Aug 15 15:34:23 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Mon Aug 15 18:38:13 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.12-xenU
     2.7 -# Tue Aug  2 23:56:13 2005
     2.8 +# Linux kernel version: 2.6.12.4-xenU
     2.9 +# Mon Aug 15 19:25:22 2005
    2.10  #
    2.11  CONFIG_XEN=y
    2.12  CONFIG_ARCH_XEN=y
    2.13 @@ -30,7 +30,7 @@ CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
    2.14  #
    2.15  CONFIG_EXPERIMENTAL=y
    2.16  CONFIG_CLEAN_COMPILE=y
    2.17 -CONFIG_BROKEN_ON_SMP=y
    2.18 +CONFIG_LOCK_KERNEL=y
    2.19  CONFIG_INIT_ENV_ARG_LIMIT=32
    2.20  
    2.21  #
    2.22 @@ -48,8 +48,10 @@ CONFIG_AUDITSYSCALL=y
    2.23  CONFIG_HOTPLUG=y
    2.24  CONFIG_KOBJECT_UEVENT=y
    2.25  # CONFIG_IKCONFIG is not set
    2.26 +# CONFIG_CPUSETS is not set
    2.27  # CONFIG_EMBEDDED is not set
    2.28  CONFIG_KALLSYMS=y
    2.29 +# CONFIG_KALLSYMS_ALL is not set
    2.30  CONFIG_KALLSYMS_EXTRA_PASS=y
    2.31  CONFIG_PRINTK=y
    2.32  CONFIG_BUG=y
    2.33 @@ -74,6 +76,7 @@ CONFIG_OBSOLETE_MODPARM=y
    2.34  CONFIG_MODVERSIONS=y
    2.35  # CONFIG_MODULE_SRCVERSION_ALL is not set
    2.36  CONFIG_KMOD=y
    2.37 +CONFIG_STOP_MACHINE=y
    2.38  CONFIG_XENARCH="x86_64"
    2.39  CONFIG_X86=y
    2.40  CONFIG_MMU=y
    2.41 @@ -86,12 +89,15 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
    2.42  CONFIG_GENERIC_CALIBRATE_DELAY=y
    2.43  CONFIG_X86_GOOD_APIC=y
    2.44  # CONFIG_HPET_TIMER is not set
    2.45 -# CONFIG_SMP is not set
    2.46 +CONFIG_SMP=y
    2.47 +CONFIG_NR_CPUS=8
    2.48 +# CONFIG_SCHED_SMT is not set
    2.49  # CONFIG_PREEMPT is not set
    2.50  # CONFIG_MICROCODE is not set
    2.51  CONFIG_X86_CPUID=y
    2.52  # CONFIG_NUMA is not set
    2.53  # CONFIG_MTRR is not set
    2.54 +CONFIG_HAVE_DEC_LOCK=y
    2.55  # CONFIG_X86_LOCAL_APIC is not set
    2.56  # CONFIG_X86_IO_APIC is not set
    2.57  # CONFIG_PCI is not set
    2.58 @@ -114,7 +120,11 @@ CONFIG_MPSC=y
    2.59  # CONFIG_GENERIC_CPU is not set
    2.60  CONFIG_X86_L1_CACHE_BYTES=128
    2.61  # CONFIG_X86_TSC is not set
    2.62 +CONFIG_X86_XEN_GENAPIC=y
    2.63  # CONFIG_X86_MSR is not set
    2.64 +CONFIG_X86_HT=y
    2.65 +# CONFIG_K8_NUMA is not set
    2.66 +# CONFIG_NUMA_EMU is not set
    2.67  CONFIG_DUMMY_IOMMU=y
    2.68  # CONFIG_X86_MCE is not set
    2.69  
    2.70 @@ -157,6 +167,7 @@ CONFIG_BINFMT_MISC=y
    2.71  CONFIG_STANDALONE=y
    2.72  CONFIG_PREVENT_FIRMWARE_BUILD=y
    2.73  CONFIG_FW_LOADER=y
    2.74 +# CONFIG_DEBUG_DRIVER is not set
    2.75  
    2.76  #
    2.77  # Block devices
    2.78 @@ -559,7 +570,6 @@ CONFIG_ACT200L_DONGLE=m
    2.79  #
    2.80  # Old SIR device drivers
    2.81  #
    2.82 -# CONFIG_IRPORT_SIR is not set
    2.83  
    2.84  #
    2.85  # Old Serial dongle support
    2.86 @@ -861,17 +871,7 @@ CONFIG_NLS_UTF8=m
    2.87  # Security options
    2.88  #
    2.89  # CONFIG_KEYS is not set
    2.90 -CONFIG_SECURITY=y
    2.91 -CONFIG_SECURITY_NETWORK=y
    2.92 -CONFIG_SECURITY_CAPABILITIES=y
    2.93 -# CONFIG_SECURITY_SECLVL is not set
    2.94 -CONFIG_SECURITY_SELINUX=y
    2.95 -CONFIG_SECURITY_SELINUX_BOOTPARAM=y
    2.96 -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
    2.97 -CONFIG_SECURITY_SELINUX_DISABLE=y
    2.98 -CONFIG_SECURITY_SELINUX_DEVELOP=y
    2.99 -CONFIG_SECURITY_SELINUX_AVC_STATS=y
   2.100 -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
   2.101 +# CONFIG_SECURITY is not set
   2.102  
   2.103  #
   2.104  # Cryptographic options
   2.105 @@ -919,5 +919,19 @@ CONFIG_ZLIB_DEFLATE=m
   2.106  # Kernel hacking
   2.107  #
   2.108  # CONFIG_PRINTK_TIME is not set
   2.109 -# CONFIG_DEBUG_KERNEL is not set
   2.110 -CONFIG_LOG_BUF_SHIFT=14
   2.111 +CONFIG_DEBUG_KERNEL=y
   2.112 +CONFIG_MAGIC_SYSRQ=y
   2.113 +CONFIG_LOG_BUF_SHIFT=15
   2.114 +# CONFIG_SCHEDSTATS is not set
   2.115 +# CONFIG_DEBUG_SLAB is not set
   2.116 +# CONFIG_DEBUG_SPINLOCK is not set
   2.117 +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
   2.118 +# CONFIG_DEBUG_KOBJECT is not set
   2.119 +# CONFIG_DEBUG_INFO is not set
   2.120 +# CONFIG_DEBUG_FS is not set
   2.121 +# CONFIG_DEBUG_STACKOVERFLOW is not set
   2.122 +# CONFIG_KPROBES is not set
   2.123 +# CONFIG_DEBUG_STACK_USAGE is not set
   2.124 +# CONFIG_DEBUG_PAGEALLOC is not set
   2.125 +# CONFIG_4KSTACKS is not set
   2.126 +# CONFIG_INIT_DEBUG is not set
     3.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64	Mon Aug 15 15:34:23 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64	Mon Aug 15 18:38:13 2005 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  #
     3.5  # Automatically generated make config: don't edit
     3.6 -# Linux kernel version: 2.6.12.3-xen0
     3.7 -# Mon Aug 15 19:46:39 2005
     3.8 +# Linux kernel version: 2.6.12.4-xen
     3.9 +# Mon Aug 15 19:36:24 2005
    3.10  #
    3.11  CONFIG_XEN=y
    3.12  CONFIG_ARCH_XEN=y
    3.13 @@ -35,6 +35,7 @@ CONFIG_EXPERIMENTAL=y
    3.14  # CONFIG_CLEAN_COMPILE is not set
    3.15  CONFIG_BROKEN=y
    3.16  CONFIG_BROKEN_ON_SMP=y
    3.17 +CONFIG_LOCK_KERNEL=y
    3.18  CONFIG_INIT_ENV_ARG_LIMIT=32
    3.19  
    3.20  #
    3.21 @@ -50,6 +51,7 @@ CONFIG_SYSCTL=y
    3.22  CONFIG_HOTPLUG=y
    3.23  CONFIG_KOBJECT_UEVENT=y
    3.24  # CONFIG_IKCONFIG is not set
    3.25 +# CONFIG_CPUSETS is not set
    3.26  # CONFIG_EMBEDDED is not set
    3.27  CONFIG_KALLSYMS=y
    3.28  CONFIG_KALLSYMS_EXTRA_PASS=y
    3.29 @@ -76,6 +78,7 @@ CONFIG_OBSOLETE_MODPARM=y
    3.30  # CONFIG_MODVERSIONS is not set
    3.31  CONFIG_MODULE_SRCVERSION_ALL=y
    3.32  CONFIG_KMOD=y
    3.33 +CONFIG_STOP_MACHINE=y
    3.34  CONFIG_XENARCH="x86_64"
    3.35  CONFIG_X86=y
    3.36  CONFIG_MMU=y
    3.37 @@ -88,12 +91,15 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
    3.38  CONFIG_GENERIC_CALIBRATE_DELAY=y
    3.39  CONFIG_X86_GOOD_APIC=y
    3.40  # CONFIG_HPET_TIMER is not set
    3.41 -# CONFIG_SMP is not set
    3.42 +CONFIG_SMP=y
    3.43 +CONFIG_NR_CPUS=8
    3.44 +# CONFIG_SCHED_SMT is not set
    3.45  # CONFIG_PREEMPT is not set
    3.46  CONFIG_MICROCODE=y
    3.47  # CONFIG_X86_CPUID is not set
    3.48  # CONFIG_NUMA is not set
    3.49  # CONFIG_MTRR is not set
    3.50 +CONFIG_HAVE_DEC_LOCK=y
    3.51  CONFIG_X86_LOCAL_APIC=y
    3.52  CONFIG_X86_IO_APIC=y
    3.53  CONFIG_PCI=y
    3.54 @@ -120,6 +126,9 @@ CONFIG_X86_L1_CACHE_BYTES=128
    3.55  # CONFIG_X86_TSC is not set
    3.56  CONFIG_X86_XEN_GENAPIC=y
    3.57  # CONFIG_X86_MSR is not set
    3.58 +CONFIG_X86_HT=y
    3.59 +# CONFIG_K8_NUMA is not set
    3.60 +# CONFIG_NUMA_EMU is not set
    3.61  # CONFIG_GART_IOMMU is not set
    3.62  CONFIG_DUMMY_IOMMU=y
    3.63  # CONFIG_X86_MCE is not set
    3.64 @@ -214,7 +223,6 @@ CONFIG_MTD_RAM=m
    3.65  CONFIG_MTD_ROM=m
    3.66  CONFIG_MTD_ABSENT=m
    3.67  # CONFIG_MTD_OBSOLETE_CHIPS is not set
    3.68 -# CONFIG_MTD_XIP is not set
    3.69  
    3.70  #
    3.71  # Mapping drivers for chip access
    3.72 @@ -2396,6 +2404,6 @@ CONFIG_ZLIB_DEFLATE=m
    3.73  #
    3.74  # CONFIG_PRINTK_TIME is not set
    3.75  # CONFIG_DEBUG_KERNEL is not set
    3.76 -CONFIG_LOG_BUF_SHIFT=14
    3.77 +CONFIG_LOG_BUF_SHIFT=15
    3.78  CONFIG_X86_FIND_SMP_CONFIG=y
    3.79  CONFIG_X86_MPPARSE=y