ia64/xen-unstable

changeset 3503:10d4d8627af0

bitkeeper revision 1.1159.212.27 (41f3a67aXzSi2IH-s4Tr3Xrk_85v6Q)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Sun Jan 23 13:28:26 2005 +0000 (2005-01-23)
parents c60c0cc29ae0 67fbcadbd686
children bb56e77896e7 81d7efca5d31 8e9727839e1d
files linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig	Sat Jan 22 17:17:31 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Jan 23 13:28:26 2005 +0000
     1.3 @@ -160,15 +160,8 @@ CONFIG_PCMCIA_PROBE=y
     1.4  #
     1.5  # Kernel hacking
     1.6  #
     1.7 -CONFIG_DEBUG_KERNEL=y
     1.8 +# CONFIG_DEBUG_KERNEL is not set
     1.9  CONFIG_EARLY_PRINTK=y
    1.10 -# CONFIG_DEBUG_STACKOVERFLOW is not set
    1.11 -# CONFIG_DEBUG_STACK_USAGE is not set
    1.12 -CONFIG_DEBUG_SLAB=y
    1.13 -CONFIG_MAGIC_SYSRQ=y
    1.14 -# CONFIG_DEBUG_SPINLOCK is not set
    1.15 -CONFIG_DEBUG_PAGEALLOC=y
    1.16 -# CONFIG_DEBUG_INFO is not set
    1.17  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    1.18  # CONFIG_FRAME_POINTER is not set
    1.19  # CONFIG_4KSTACKS is not set
     2.1 --- a/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig	Sat Jan 22 17:17:31 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig	Sun Jan 23 13:28:26 2005 +0000
     2.3 @@ -129,15 +129,8 @@ CONFIG_HAVE_DEC_LOCK=y
     2.4  #
     2.5  # Kernel hacking
     2.6  #
     2.7 -CONFIG_DEBUG_KERNEL=y
     2.8 +# CONFIG_DEBUG_KERNEL is not set
     2.9  CONFIG_EARLY_PRINTK=y
    2.10 -# CONFIG_DEBUG_STACKOVERFLOW is not set
    2.11 -# CONFIG_DEBUG_STACK_USAGE is not set
    2.12 -CONFIG_DEBUG_SLAB=y
    2.13 -# CONFIG_MAGIC_SYSRQ is not set
    2.14 -# CONFIG_DEBUG_SPINLOCK is not set
    2.15 -CONFIG_DEBUG_PAGEALLOC=y
    2.16 -# CONFIG_DEBUG_INFO is not set
    2.17  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    2.18  # CONFIG_FRAME_POINTER is not set
    2.19  # CONFIG_4KSTACKS is not set