ia64/xen-unstable

changeset 3230:d3dae9b7f306

bitkeeper revision 1.1159.183.39 (41adaa0b8KnGzMv2-RXeuLtCLV-zxA)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Dec 01 11:24:59 2004 +0000 (2004-12-01)
parents e1ae39488963 99caf078a6e4
children f2e12f9f7cc8
files linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig linux-2.6.9-xen-sparse/drivers/xen/netback/interface.c
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Wed Dec 01 09:41:03 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Wed Dec 01 11:24:59 2004 +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.9-xen0
     1.7 -# Sun Nov 14 16:55:05 2004
     1.8 +# Wed Dec  1 09:22:49 2004
     1.9  #
    1.10  CONFIG_XEN=y
    1.11  CONFIG_ARCH_XEN=y
    1.12 @@ -153,10 +153,10 @@ CONFIG_DEBUG_KERNEL=y
    1.13  CONFIG_EARLY_PRINTK=y
    1.14  # CONFIG_DEBUG_STACKOVERFLOW is not set
    1.15  # CONFIG_DEBUG_STACK_USAGE is not set
    1.16 -# CONFIG_DEBUG_SLAB is not set
    1.17 +CONFIG_DEBUG_SLAB=y
    1.18  CONFIG_MAGIC_SYSRQ=y
    1.19  # CONFIG_DEBUG_SPINLOCK is not set
    1.20 -# CONFIG_DEBUG_PAGEALLOC is not set
    1.21 +CONFIG_DEBUG_PAGEALLOC=y
    1.22  # CONFIG_DEBUG_INFO is not set
    1.23  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    1.24  # CONFIG_FRAME_POINTER is not set
     2.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Wed Dec 01 09:41:03 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Wed Dec 01 11:24:59 2004 +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.9-xen0
     2.7 -# Sun Oct 31 21:32:23 2004
     2.8 +# Linux kernel version: 2.6.9-xenU
     2.9 +# Wed Dec  1 09:22:09 2004
    2.10  #
    2.11  CONFIG_XEN=y
    2.12  CONFIG_ARCH_XEN=y
    2.13 @@ -47,6 +47,7 @@ CONFIG_HOTPLUG=y
    2.14  # CONFIG_IKCONFIG is not set
    2.15  # CONFIG_EMBEDDED is not set
    2.16  CONFIG_KALLSYMS=y
    2.17 +# CONFIG_KALLSYMS_ALL is not set
    2.18  # CONFIG_KALLSYMS_EXTRA_PASS is not set
    2.19  CONFIG_FUTEX=y
    2.20  CONFIG_EPOLL=y
    2.21 @@ -116,8 +117,15 @@ CONFIG_HAVE_DEC_LOCK=y
    2.22  #
    2.23  # Kernel hacking
    2.24  #
    2.25 -# CONFIG_DEBUG_KERNEL is not set
    2.26 +CONFIG_DEBUG_KERNEL=y
    2.27  CONFIG_EARLY_PRINTK=y
    2.28 +# CONFIG_DEBUG_STACKOVERFLOW is not set
    2.29 +# CONFIG_DEBUG_STACK_USAGE is not set
    2.30 +CONFIG_DEBUG_SLAB=y
    2.31 +# CONFIG_MAGIC_SYSRQ is not set
    2.32 +# CONFIG_DEBUG_SPINLOCK is not set
    2.33 +CONFIG_DEBUG_PAGEALLOC=y
    2.34 +# CONFIG_DEBUG_INFO is not set
    2.35  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    2.36  # CONFIG_FRAME_POINTER is not set
    2.37  # CONFIG_4KSTACKS is not set
    2.38 @@ -142,6 +150,7 @@ CONFIG_BINFMT_ELF=y
    2.39  CONFIG_STANDALONE=y
    2.40  CONFIG_PREVENT_FIRMWARE_BUILD=y
    2.41  # CONFIG_FW_LOADER is not set
    2.42 +# CONFIG_DEBUG_DRIVER is not set
    2.43  
    2.44  #
    2.45  # Block devices
     3.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/netback/interface.c	Wed Dec 01 09:41:03 2004 +0000
     3.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/netback/interface.c	Wed Dec 01 11:24:59 2004 +0000
     3.3 @@ -35,8 +35,8 @@ static void __netif_disconnect_complete(
     3.4  
     3.5      /*
     3.6       * These can't be done in netif_disconnect() because at that point there
     3.7 -     * may be outstanding requests at the disc whose asynchronous responses
     3.8 -     * must still be notified to the remote driver.
     3.9 +     * may be outstanding requests in the network stack whose asynchronous
    3.10 +     * responses must still be notified to the remote driver.
    3.11       */
    3.12      unbind_evtchn_from_irq(netif->evtchn);
    3.13      vfree(netif->tx); /* Frees netif->rx as well. */
    3.14 @@ -84,7 +84,7 @@ void netif_create(netif_be_create_t *cre
    3.15      unsigned int       handle = create->netif_handle;
    3.16      struct net_device *dev;
    3.17      netif_t          **pnetif, *netif;
    3.18 -    char               name[IFNAMSIZ] = {};
    3.19 +    char               name[IFNAMSIZ];
    3.20  
    3.21      snprintf(name, IFNAMSIZ - 1, "vif%u.%u", domid, handle);
    3.22      dev = alloc_netdev(sizeof(netif_t), name, ether_setup);
    3.23 @@ -116,7 +116,7 @@ void netif_create(netif_be_create_t *cre
    3.24          {
    3.25              DPRINTK("Could not create netif: already exists\n");
    3.26              create->status = NETIF_BE_STATUS_INTERFACE_EXISTS;
    3.27 -            kfree(dev);
    3.28 +            free_netdev(dev);
    3.29              return;
    3.30          }
    3.31          pnetif = &(*pnetif)->hash_next;
    3.32 @@ -137,7 +137,7 @@ void netif_create(netif_be_create_t *cre
    3.33          DPRINTK("Could not register new net device %s: err=%d\n",
    3.34                  dev->name, err);
    3.35          create->status = NETIF_BE_STATUS_OUT_OF_MEMORY;
    3.36 -        kfree(dev);
    3.37 +        free_netdev(dev);
    3.38          return;
    3.39      }
    3.40  
    3.41 @@ -176,7 +176,7 @@ void netif_destroy(netif_be_destroy_t *d
    3.42   destroy:
    3.43      *pnetif = netif->hash_next;
    3.44      unregister_netdev(netif->dev);
    3.45 -    kfree(netif->dev);
    3.46 +    free_netdev(netif->dev);
    3.47      destroy->status = NETIF_BE_STATUS_OKAY;
    3.48  }
    3.49