ia64/xen-unstable

changeset 6002:565cec5b9cc2

merge?
author cl349@firebug.cl.cam.ac.uk
date Tue Aug 02 23:13:50 2005 +0000 (2005-08-02)
parents 1032271a0abf 9c1e727db757
children ba4ca709ed7e
files Config.mk linux-2.4-xen-sparse/arch/xen/Makefile linux-2.4-xen-sparse/arch/xen/config.in 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/i386/kernel/smpboot.c linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
line diff
     1.1 --- a/Config.mk	Tue Aug 02 23:13:13 2005 +0000
     1.2 +++ b/Config.mk	Tue Aug 02 23:13:50 2005 +0000
     1.3 @@ -3,7 +3,7 @@
     1.4  # Currently supported architectures: x86_32, x86_64
     1.5  XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     1.6  XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
     1.7 -XEN_TARGET_X86_PAE  ?= n
     1.8 +XEN_TARGET_X86_PAE  ?= y
     1.9  
    1.10  # Tools to run on system hosting the build
    1.11  HOSTCC     = gcc
     2.1 --- a/linux-2.4-xen-sparse/arch/xen/Makefile	Tue Aug 02 23:13:13 2005 +0000
     2.2 +++ b/linux-2.4-xen-sparse/arch/xen/Makefile	Tue Aug 02 23:13:50 2005 +0000
     2.3 @@ -61,7 +61,6 @@ SUBDIRS += arch/xen/drivers/console
     2.4  SUBDIRS += arch/xen/drivers/evtchn
     2.5  SUBDIRS += arch/xen/drivers/blkif
     2.6  SUBDIRS += arch/xen/drivers/netif
     2.7 -#SUBDIRS += arch/xen/drivers/usbif
     2.8  SUBDIRS += arch/xen/drivers/balloon
     2.9  ifdef CONFIG_XEN_PRIVILEGED_GUEST
    2.10  SUBDIRS += arch/xen/drivers/dom0 
    2.11 @@ -72,7 +71,6 @@ CORE_FILES += arch/xen/drivers/evtchn/dr
    2.12  CORE_FILES += arch/xen/drivers/console/drv.o
    2.13  DRIVERS += arch/xen/drivers/blkif/drv.o
    2.14  DRIVERS += arch/xen/drivers/netif/drv.o
    2.15 -DRIVERS += arch/xen/drivers/usbif/drv.o
    2.16  ifdef CONFIG_XEN_PRIVILEGED_GUEST
    2.17  CORE_FILES += arch/xen/drivers/dom0/drv.o
    2.18  endif
     3.1 --- a/linux-2.4-xen-sparse/arch/xen/config.in	Tue Aug 02 23:13:13 2005 +0000
     3.2 +++ b/linux-2.4-xen-sparse/arch/xen/config.in	Tue Aug 02 23:13:50 2005 +0000
     3.3 @@ -16,14 +16,10 @@ mainmenu_option next_comment
     3.4  comment 'Xen'
     3.5  bool 'Support for privileged operations (domain 0)' CONFIG_XEN_PRIVILEGED_GUEST
     3.6  bool 'Device-driver domain (physical device access)' CONFIG_XEN_PHYSDEV_ACCESS
     3.7 -if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
     3.8 -    bool 'USB-device backend driver' CONFIG_XEN_USB_BACKEND
     3.9 -fi
    3.10  bool 'Scrub memory before freeing it to Xen' CONFIG_XEN_SCRUB_PAGES
    3.11  bool 'Network-device frontend driver' CONFIG_XEN_NETDEV_FRONTEND
    3.12  bool 'Block-device frontend driver' CONFIG_XEN_BLKDEV_FRONTEND
    3.13  bool 'Block-device uses grant tables' CONFIG_XEN_BLKDEV_GRANT
    3.14 -bool 'USB-device frontend driver' CONFIG_XEN_USB_FRONTEND
    3.15  endmenu
    3.16  # The IBM S/390 patch needs this.
    3.17  define_bool CONFIG_NO_IDLE_HZ y
    3.18 @@ -267,7 +263,7 @@ fi
    3.19  
    3.20  source drivers/char/Config.in
    3.21  
    3.22 -if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" -o "$CONFIG_XEN_USB_FRONTEND" = "y" ]; then
    3.23 +if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    3.24     source drivers/media/Config.in
    3.25  fi
    3.26  
    3.27 @@ -302,14 +298,8 @@ if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" 
    3.28     endmenu
    3.29  fi
    3.30  
    3.31 -if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" -o "$CONFIG_XEN_USB_FRONTEND" = "y" ]; then
    3.32 -   if [ "$CONFIG_XEN_USB_FRONTEND" = "y" -o "$CONFIG_XEN_USB_BACKEND" = "y" ]; then
    3.33 -       define_bool CONFIG_USB y
    3.34 -   fi
    3.35 +if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    3.36     source drivers/usb/Config.in
    3.37 -fi
    3.38 -
    3.39 -if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    3.40     source net/bluetooth/Config.in
    3.41  fi
    3.42  
     4.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Tue Aug 02 23:13:13 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Tue Aug 02 23:13:50 2005 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  #
     4.5  # Automatically generated make config: don't edit
     4.6  # Linux kernel version: 2.6.12-xen0
     4.7 -# Wed Jun 29 10:01:20 2005
     4.8 +# Tue Aug  2 23:55:35 2005
     4.9  #
    4.10  CONFIG_XEN=y
    4.11  CONFIG_ARCH_XEN=y
    4.12 @@ -18,6 +18,8 @@ CONFIG_XEN_BLKDEV_GRANT=y
    4.13  CONFIG_XEN_NETDEV_BACKEND=y
    4.14  CONFIG_XEN_BLKDEV_FRONTEND=y
    4.15  CONFIG_XEN_NETDEV_FRONTEND=y
    4.16 +# CONFIG_XEN_NETDEV_GRANT_TX is not set
    4.17 +# CONFIG_XEN_NETDEV_GRANT_RX is not set
    4.18  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
    4.19  # CONFIG_XEN_BLKDEV_TAP is not set
    4.20  # CONFIG_XEN_SHADOW_MODE is not set
     5.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Tue Aug 02 23:13:13 2005 +0000
     5.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Tue Aug 02 23:13:50 2005 +0000
     5.3 @@ -1,7 +1,7 @@
     5.4  #
     5.5  # Automatically generated make config: don't edit
     5.6  # Linux kernel version: 2.6.12-xenU
     5.7 -# Thu Jul  7 11:43:14 2005
     5.8 +# Tue Aug  2 23:56:13 2005
     5.9  #
    5.10  CONFIG_XEN=y
    5.11  CONFIG_ARCH_XEN=y
    5.12 @@ -15,6 +15,8 @@ CONFIG_NO_IDLE_HZ=y
    5.13  CONFIG_XEN_BLKDEV_GRANT=y
    5.14  CONFIG_XEN_BLKDEV_FRONTEND=y
    5.15  CONFIG_XEN_NETDEV_FRONTEND=y
    5.16 +# CONFIG_XEN_NETDEV_GRANT_TX is not set
    5.17 +# CONFIG_XEN_NETDEV_GRANT_RX is not set
    5.18  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
    5.19  # CONFIG_XEN_BLKDEV_TAP is not set
    5.20  # CONFIG_XEN_SHADOW_MODE is not set