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

5 files changed, 7 insertions, 20 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index cbc3dd3c3e..a5aabc0fcf 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -20,6 +20,7 @@ gm281@tetrapod.cl.cam.ac.uk
 iap10@freefall.cl.cam.ac.uk
 iap10@labyrinth.cl.cam.ac.uk
 iap10@nidd.cl.cam.ac.uk
+iap10@pb007.cl.cam.ac.uk
 iap10@striker.cl.cam.ac.uk
 iap10@tetris.cl.cam.ac.uk
 jws22@gauntlet.cl.cam.ac.uk
diff --git a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
index 91aa6499b7..d3e884bff4 100644
--- a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -158,15 +158,8 @@ CONFIG_PCMCIA_PROBE=y
 #
 # Kernel hacking
 #
-CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KERNEL is not set
 CONFIG_EARLY_PRINTK=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_SLAB=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_PAGEALLOC=y
-# CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_4KSTACKS is not set
diff --git a/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig b/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig
index e90dd4bc5a..63450b421c 100644
--- a/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig
+++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig
@@ -128,15 +128,8 @@ CONFIG_HAVE_DEC_LOCK=y
 #
 # Kernel hacking
 #
-CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KERNEL is not set
 CONFIG_EARLY_PRINTK=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_SLAB=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_PAGEALLOC=y
-# CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_4KSTACKS is not set
diff --git a/tools/examples/network b/tools/examples/network
index b679b93e43..229881d737 100755
--- a/tools/examples/network
+++ b/tools/examples/network
@@ -61,13 +61,13 @@ transfer_addrs () {
     local src=$1
     local dst=$2
     # Don't bother if $dst already has IP addresses.
-    if ip addr show dev ${dst} | egrep -q '^ *inet' ; then
+    if ip addr show dev ${dst} | egrep -q '^ *inet ' ; then
         return
     fi
     # Address lines start with 'inet' and have the device in them.
     # Replace 'inet' with 'ip addr add' and change the device name $src
     # to 'dev $src'. Remove netmask as we'll add routes later.
-    ip addr show dev ${src} | egrep '^ *inet' | sed -e "
+    ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
 s/inet/ip addr add/
 s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@
 s/${src}/dev ${dst}/
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index d569a435c5..c3e1c2aea1 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -24,13 +24,13 @@ CFLAGS  += $(call test-gcc-flag,-fno-stack-protector-all)
 
 ifeq ($(TARGET_SUBARCH),x86_32)
 CFLAGS  += -m32 -march=i686
-LDFLAGS := --oformat elf32-i386 
+LDFLAGS := -m elf_i386 
 endif
 
 ifeq ($(TARGET_SUBARCH),x86_64)
 CFLAGS  += -m64 -mno-red-zone -fpic -fno-reorder-blocks
 CFLAGS  += -fno-asynchronous-unwind-tables
-LDFLAGS := --oformat elf64-x86-64
+LDFLAGS := -m elf_x86_64
 endif
 
 # Test for at least GCC v3.2.x.