ia64/xen-unstable

changeset 3515:e2f1686415aa

bitkeeper revision 1.1159.223.30 (41f57c8aGPV5CqOP-AQvc0TjHU_n8A)

Merge pb007.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into pb007.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
author iap10@pb007.cl.cam.ac.uk
date Mon Jan 24 22:54:02 2005 +0000 (2005-01-24)
parents 288b96264654 4df7d8e48278
children 1a4f61d36171
files BitKeeper/etc/logging_ok linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig tools/examples/network xen/arch/x86/Rules.mk
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Mon Jan 24 22:34:15 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Mon Jan 24 22:54:02 2005 +0000
     1.3 @@ -20,6 +20,7 @@ gm281@tetrapod.cl.cam.ac.uk
     1.4  iap10@freefall.cl.cam.ac.uk
     1.5  iap10@labyrinth.cl.cam.ac.uk
     1.6  iap10@nidd.cl.cam.ac.uk
     1.7 +iap10@pb007.cl.cam.ac.uk
     1.8  iap10@striker.cl.cam.ac.uk
     1.9  iap10@tetris.cl.cam.ac.uk
    1.10  jws22@gauntlet.cl.cam.ac.uk
     2.1 --- a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig	Mon Jan 24 22:34:15 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig	Mon Jan 24 22:54:02 2005 +0000
     2.3 @@ -158,15 +158,8 @@ CONFIG_PCMCIA_PROBE=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=y
    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
     3.1 --- a/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig	Mon Jan 24 22:34:15 2005 +0000
     3.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig	Mon Jan 24 22:54:02 2005 +0000
     3.3 @@ -128,15 +128,8 @@ CONFIG_HAVE_DEC_LOCK=y
     3.4  #
     3.5  # Kernel hacking
     3.6  #
     3.7 -CONFIG_DEBUG_KERNEL=y
     3.8 +# CONFIG_DEBUG_KERNEL is not set
     3.9  CONFIG_EARLY_PRINTK=y
    3.10 -# CONFIG_DEBUG_STACKOVERFLOW is not set
    3.11 -# CONFIG_DEBUG_STACK_USAGE is not set
    3.12 -CONFIG_DEBUG_SLAB=y
    3.13 -# CONFIG_MAGIC_SYSRQ is not set
    3.14 -# CONFIG_DEBUG_SPINLOCK is not set
    3.15 -CONFIG_DEBUG_PAGEALLOC=y
    3.16 -# CONFIG_DEBUG_INFO is not set
    3.17  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    3.18  # CONFIG_FRAME_POINTER is not set
    3.19  # CONFIG_4KSTACKS is not set
     4.1 --- a/tools/examples/network	Mon Jan 24 22:34:15 2005 +0000
     4.2 +++ b/tools/examples/network	Mon Jan 24 22:54:02 2005 +0000
     4.3 @@ -61,13 +61,13 @@ transfer_addrs () {
     4.4      local src=$1
     4.5      local dst=$2
     4.6      # Don't bother if $dst already has IP addresses.
     4.7 -    if ip addr show dev ${dst} | egrep -q '^ *inet' ; then
     4.8 +    if ip addr show dev ${dst} | egrep -q '^ *inet ' ; then
     4.9          return
    4.10      fi
    4.11      # Address lines start with 'inet' and have the device in them.
    4.12      # Replace 'inet' with 'ip addr add' and change the device name $src
    4.13      # to 'dev $src'. Remove netmask as we'll add routes later.
    4.14 -    ip addr show dev ${src} | egrep '^ *inet' | sed -e "
    4.15 +    ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
    4.16  s/inet/ip addr add/
    4.17  s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@
    4.18  s/${src}/dev ${dst}/
     5.1 --- a/xen/arch/x86/Rules.mk	Mon Jan 24 22:34:15 2005 +0000
     5.2 +++ b/xen/arch/x86/Rules.mk	Mon Jan 24 22:54:02 2005 +0000
     5.3 @@ -24,13 +24,13 @@ CFLAGS  += $(call test-gcc-flag,-fno-sta
     5.4  
     5.5  ifeq ($(TARGET_SUBARCH),x86_32)
     5.6  CFLAGS  += -m32 -march=i686
     5.7 -LDFLAGS := --oformat elf32-i386 
     5.8 +LDFLAGS := -m elf_i386 
     5.9  endif
    5.10  
    5.11  ifeq ($(TARGET_SUBARCH),x86_64)
    5.12  CFLAGS  += -m64 -mno-red-zone -fpic -fno-reorder-blocks
    5.13  CFLAGS  += -fno-asynchronous-unwind-tables
    5.14 -LDFLAGS := --oformat elf64-x86-64
    5.15 +LDFLAGS := -m elf_x86_64
    5.16  endif
    5.17  
    5.18  # Test for at least GCC v3.2.x.