Imported linux-2.6.27.39 suse/xen patches.

[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.xen / xen3-fixup-xen

diff --git a/src/patches/suse-2.6.27.31/patches.xen/xen3-fixup-xen b/src/patches/suse-2.6.27.39/patches.xen/xen3-fixup-xen
similarity index 95%
rename from src/patches/suse-2.6.27.31/patches.xen/xen3-fixup-xen
rename to src/patches/suse-2.6.27.39/patches.xen/xen3-fixup-xen
index 2781775540f125ba14e895b42a18905f8398bafd..3380e27a4440c772ee6e831b16fc487da34981d1 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.xen/xen3-fixup-xen
+++ b/src/patches/suse-2.6.27.39/patches.xen/xen3-fixup-xen
@@ -4,10 +4,8 @@ Patch-mainline: obsolete
 
 Acked-by: jbeulich@novell.com
 
-Index: head-2008-11-25/drivers/xen/Makefile
-===================================================================
---- head-2008-11-25.orig/drivers/xen/Makefile  2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/drivers/xen/Makefile       2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/drivers/xen/Makefile 2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/drivers/xen/Makefile      2008-11-25 12:35:56.000000000 +0100
 @@ -1,4 +1,25 @@
 -obj-y += grant-table.o features.o events.o manage.o
 +obj-y += core/
@@ -37,10 +35,8 @@ Index: head-2008-11-25/drivers/xen/Makefile
 +obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL)               += sfc_netutil/
 +obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND)   += sfc_netfront/
 +obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND)    += sfc_netback/
-Index: head-2008-11-25/drivers/xen/xenbus/Makefile
-===================================================================
---- head-2008-11-25.orig/drivers/xen/xenbus/Makefile   2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/drivers/xen/xenbus/Makefile        2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/drivers/xen/xenbus/Makefile  2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/drivers/xen/xenbus/Makefile       2008-11-25 12:35:56.000000000 +0100
 @@ -1,7 +1,9 @@
 -obj-y += xenbus.o
 +obj-y += xenbus_client.o xenbus_comms.o xenbus_xs.o xenbus_probe.o
@@ -57,10 +53,8 @@ Index: head-2008-11-25/drivers/xen/xenbus/Makefile
 +xenbus-$(CONFIG_XEN_BACKEND) += xenbus_probe_backend.o
 +obj-y += $(xenbus-y) $(xenbus-m)
 +obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o
-Index: head-2008-11-25/drivers/xen/xenbus/xenbus_client.c
-===================================================================
---- head-2008-11-25.orig/drivers/xen/xenbus/xenbus_client.c    2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/drivers/xen/xenbus/xenbus_client.c 2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/drivers/xen/xenbus/xenbus_client.c   2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/drivers/xen/xenbus/xenbus_client.c        2008-11-25 12:35:56.000000000 +0100
 @@ -30,14 +30,18 @@
   * IN THE SOFTWARE.
   */
@@ -528,10 +522,8 @@ Index: head-2008-11-25/drivers/xen/xenbus/xenbus_client.c
  enum xenbus_state xenbus_read_driver_state(const char *path)
  {
        enum xenbus_state result;
-Index: head-2008-11-25/drivers/xen/xenbus/xenbus_comms.c
-===================================================================
---- head-2008-11-25.orig/drivers/xen/xenbus/xenbus_comms.c     2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/drivers/xen/xenbus/xenbus_comms.c  2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/drivers/xen/xenbus/xenbus_comms.c    2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/drivers/xen/xenbus/xenbus_comms.c 2008-11-25 12:35:56.000000000 +0100
 @@ -34,19 +34,28 @@
  #include <linux/interrupt.h>
  #include <linux/sched.h>
@@ -626,10 +618,8 @@ Index: head-2008-11-25/drivers/xen/xenbus/xenbus_comms.c
 +
        return 0;
  }
-Index: head-2008-11-25/drivers/xen/xenbus/xenbus_probe.c
-===================================================================
---- head-2008-11-25.orig/drivers/xen/xenbus/xenbus_probe.c     2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/drivers/xen/xenbus/xenbus_probe.c  2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/drivers/xen/xenbus/xenbus_probe.c    2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/drivers/xen/xenbus/xenbus_probe.c 2008-11-25 12:35:56.000000000 +0100
 @@ -4,6 +4,7 @@
   * Copyright (C) 2005 Rusty Russell, IBM Corporation
   * Copyright (C) 2005 Mike Wray, Hewlett-Packard
@@ -1372,10 +1362,8 @@ Index: head-2008-11-25/drivers/xen/xenbus/xenbus_probe.c
 +      return bus_for_each_dev(&xenbus_frontend.bus, NULL, arg, fn);
 +}
 +EXPORT_SYMBOL_GPL(xenbus_for_each_frontend);
-Index: head-2008-11-25/drivers/xen/xenbus/xenbus_probe.h
-===================================================================
---- head-2008-11-25.orig/drivers/xen/xenbus/xenbus_probe.h     2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/drivers/xen/xenbus/xenbus_probe.h  2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/drivers/xen/xenbus/xenbus_probe.h    2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/drivers/xen/xenbus/xenbus_probe.h 2008-11-25 12:35:56.000000000 +0100
 @@ -34,41 +34,42 @@
  #ifndef _XENBUS_PROBE_H
  #define _XENBUS_PROBE_H
@@ -1428,10 +1416,8 @@ Index: head-2008-11-25/drivers/xen/xenbus/xenbus_probe.h
  
  #endif
 +
-Index: head-2008-11-25/drivers/xen/xenbus/xenbus_xs.c
-===================================================================
---- head-2008-11-25.orig/drivers/xen/xenbus/xenbus_xs.c        2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/drivers/xen/xenbus/xenbus_xs.c     2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/drivers/xen/xenbus/xenbus_xs.c       2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/drivers/xen/xenbus/xenbus_xs.c    2008-11-25 12:35:56.000000000 +0100
 @@ -47,6 +47,14 @@
  #include <xen/xenbus.h>
  #include "xenbus_comms.h"
@@ -1612,10 +1598,8 @@ Index: head-2008-11-25/drivers/xen/xenbus/xenbus_xs.c
        for (;;) {
                err = process_msg();
                if (err)
-Index: head-2008-11-25/include/xen/balloon.h
-===================================================================
---- head-2008-11-25.orig/include/xen/balloon.h 2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/balloon.h      2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/balloon.h        2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/balloon.h     2008-11-25 12:35:56.000000000 +0100
 @@ -31,12 +31,9 @@
   * IN THE SOFTWARE.
   */
@@ -1639,10 +1623,8 @@ Index: head-2008-11-25/include/xen/balloon.h
  
 -#endif /* __XEN_BALLOON_H__ */
 +#endif /* __ASM_BALLOON_H__ */
-Index: head-2008-11-25/include/xen/interface/callback.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/callback.h      2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/callback.h   2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/callback.h     2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/callback.h  2008-11-25 12:35:56.000000000 +0100
 @@ -86,6 +86,8 @@ struct callback_register {
        uint16_t flags;
        xen_callback_t address;
@@ -1675,10 +1657,8 @@ Index: head-2008-11-25/include/xen/interface/callback.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/elfnote.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/elfnote.h       2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/elfnote.h    2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/elfnote.h      2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/elfnote.h   2008-11-25 12:35:56.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Definitions used for the Xen ELF notes.
@@ -1802,10 +1782,8 @@ Index: head-2008-11-25/include/xen/interface/elfnote.h
  #endif /* __XEN_PUBLIC_ELFNOTE_H__ */
  
  /*
-Index: head-2008-11-25/include/xen/interface/event_channel.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/event_channel.h 2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/event_channel.h      2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/event_channel.h        2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/event_channel.h     2008-11-25 12:35:56.000000000 +0100
 @@ -3,14 +3,39 @@
   *
   * Event channels between domains.
@@ -2144,10 +2122,8 @@ Index: head-2008-11-25/include/xen/interface/event_channel.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/features.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/features.h      2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/features.h   2008-11-25 12:22:34.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/features.h     2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/features.h  2008-11-25 12:22:34.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Feature flags, reported by XENVER_get_features.
@@ -2199,10 +2175,8 @@ Index: head-2008-11-25/include/xen/interface/features.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/grant_table.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/grant_table.h   2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/grant_table.h        2008-11-25 12:22:34.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/grant_table.h  2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/grant_table.h       2008-11-25 12:22:34.000000000 +0100
 @@ -100,6 +100,7 @@ struct grant_entry {
       */
      uint32_t frame;
@@ -2414,10 +2388,8 @@ Index: head-2008-11-25/include/xen/interface/grant_table.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/io/blkif.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/blkif.h      2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/blkif.h   2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/blkif.h     2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/blkif.h  2008-11-25 12:35:56.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Unified block-device I/O interface for Xen guest OSes.
@@ -2545,10 +2517,8 @@ Index: head-2008-11-25/include/xen/interface/io/blkif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/io/console.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/console.h    2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/console.h 2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/console.h   2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/console.h        2008-11-25 12:35:56.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Console I/O interface for Xen guest OSes.
@@ -2588,10 +2558,8 @@ Index: head-2008-11-25/include/xen/interface/io/console.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/io/fbif.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/fbif.h       2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/fbif.h    2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/fbif.h      2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/fbif.h   2008-11-25 12:35:56.000000000 +0100
 @@ -41,12 +41,13 @@
   */
  #define XENFB_TYPE_UPDATE 2
@@ -2770,10 +2738,8 @@ Index: head-2008-11-25/include/xen/interface/io/fbif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/io/kbdif.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/kbdif.h      2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/kbdif.h   2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/kbdif.h     2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/kbdif.h  2008-11-25 12:35:56.000000000 +0100
 @@ -45,34 +45,38 @@
   */
  #define XENKBD_TYPE_POS     4
@@ -2891,10 +2857,8 @@ Index: head-2008-11-25/include/xen/interface/io/kbdif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/io/netif.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/netif.h      2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/netif.h   2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/netif.h     2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/netif.h  2008-11-25 12:35:56.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Unified network-device I/O interface for Xen guest OSes.
@@ -3094,10 +3058,8 @@ Index: head-2008-11-25/include/xen/interface/io/netif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/io/protocols.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/protocols.h  2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/protocols.h       2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/protocols.h 2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/protocols.h      2008-11-25 12:35:56.000000000 +0100
 @@ -1,10 +1,31 @@
 +/******************************************************************************
 + * protocols.h
@@ -3140,10 +3102,8 @@ Index: head-2008-11-25/include/xen/interface/io/protocols.h
  #else
  # error arch fixup needed here
  #endif
-Index: head-2008-11-25/include/xen/interface/io/ring.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/ring.h       2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/ring.h    2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/ring.h      2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/ring.h   2008-11-25 12:35:56.000000000 +0100
 @@ -3,16 +3,42 @@
   *
   * Shared producer-consumer ring macros.
@@ -3527,10 +3487,8 @@ Index: head-2008-11-25/include/xen/interface/io/ring.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/io/xenbus.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/xenbus.h     2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/xenbus.h  2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/xenbus.h    2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/xenbus.h 2008-11-25 12:35:56.000000000 +0100
 @@ -3,42 +3,78 @@
   *
   * Xenbus protocol details.
@@ -3634,10 +3592,8 @@ Index: head-2008-11-25/include/xen/interface/io/xenbus.h
 + * indent-tabs-mode: nil
   * End:
   */
-Index: head-2008-11-25/include/xen/interface/io/xs_wire.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/io/xs_wire.h    2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/io/xs_wire.h 2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/io/xs_wire.h   2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/io/xs_wire.h        2008-11-25 12:35:56.000000000 +0100
 @@ -1,6 +1,25 @@
  /*
   * Details of the "wire" protocol between Xen Store Daemon and client
@@ -3711,10 +3667,8 @@ Index: head-2008-11-25/include/xen/interface/io/xs_wire.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/memory.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/memory.h        2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/memory.h     2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/memory.h       2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/memory.h    2008-11-25 12:35:56.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Memory reservation and information.
@@ -4009,10 +3963,8 @@ Index: head-2008-11-25/include/xen/interface/memory.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/physdev.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/physdev.h       2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/physdev.h    2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/physdev.h      2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/physdev.h   2008-11-25 12:35:56.000000000 +0100
 @@ -24,7 +24,7 @@
  /*
   * Prototype for this hypercall is:
@@ -4261,10 +4213,8 @@ Index: head-2008-11-25/include/xen/interface/physdev.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/sched.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/sched.h 2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/sched.h      2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/sched.h        2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/sched.h     2008-11-25 12:35:56.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Scheduler state interactions
@@ -4364,10 +4314,8 @@ Index: head-2008-11-25/include/xen/interface/sched.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/vcpu.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/vcpu.h  2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/vcpu.h       2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/vcpu.h 2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/vcpu.h      2008-11-25 12:35:56.000000000 +0100
 @@ -29,9 +29,9 @@
  
  /*
@@ -4584,10 +4532,8 @@ Index: head-2008-11-25/include/xen/interface/vcpu.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/version.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/version.h       2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/version.h    2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/version.h      2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/version.h   2008-11-25 12:35:56.000000000 +0100
 @@ -3,6 +3,24 @@
   *
   * Xen version, type, and compile information.
@@ -4689,10 +4635,8 @@ Index: head-2008-11-25/include/xen/interface/version.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/interface/xen.h
-===================================================================
---- head-2008-11-25.orig/include/xen/interface/xen.h   2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/interface/xen.h        2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/interface/xen.h  2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/interface/xen.h       2008-11-25 12:35:56.000000000 +0100
 @@ -3,35 +3,68 @@
   *
   * Guest OS interface to Xen.
@@ -4861,7 +4805,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  
  /* Architecture-specific VIRQ definitions. */
  #define VIRQ_ARCH_0    16
-@@ -91,6 +158,7 @@
+@@ -91,6 +160,7 @@
  #define VIRQ_ARCH_7    23
  
  #define NR_VIRQS       24
@@ -4869,7 +4813,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  /*
   * MMU-UPDATE REQUESTS
   *
-@@ -166,6 +234,13 @@
+@@ -166,6 +236,13 @@
   * cmd: MMUEXT_SET_LDT
   * linear_addr: Linear address of LDT base (NB. must be page-aligned).
   * nr_ents: Number of entries in LDT.
@@ -4883,7 +4827,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
   */
  #define MMUEXT_PIN_L1_TABLE      0
  #define MMUEXT_PIN_L2_TABLE      1
-@@ -182,24 +257,34 @@
+@@ -182,24 +259,34 @@
  #define MMUEXT_FLUSH_CACHE      12
  #define MMUEXT_SET_LDT          13
  #define MMUEXT_NEW_USER_BASEPTR 15
@@ -4932,7 +4876,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  #endif
  
  /* These are passed as 'flags' to update_va_mapping. They can be ORed. */
-@@ -224,11 +309,24 @@ DEFINE_GUEST_HANDLE_STRUCT(mmuext_op);
+@@ -224,11 +311,24 @@ DEFINE_GUEST_HANDLE_STRUCT(mmuext_op);
   */
  #define VMASST_CMD_enable                0
  #define VMASST_CMD_disable               1
@@ -4958,7 +4902,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  
  #ifndef __ASSEMBLY__
  
-@@ -267,18 +365,19 @@ struct mmu_update {
+@@ -267,18 +367,19 @@ struct mmu_update {
      uint64_t ptr;       /* Machine address of PTE. */
      uint64_t val;       /* New contents of PTE.    */
  };
@@ -4982,7 +4926,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  
  /*
   * Event channel endpoints per domain:
-@@ -287,173 +386,240 @@ DEFINE_GUEST_HANDLE_STRUCT(multicall_ent
+@@ -287,173 +388,240 @@ DEFINE_GUEST_HANDLE_STRUCT(multicall_ent
  #define NR_EVENT_CHANNELS (sizeof(unsigned long) * sizeof(unsigned long) * 64)
  
  struct vcpu_time_info {
@@ -5353,7 +5297,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  
  typedef uint8_t xen_domain_handle_t[16];
  
-@@ -461,6 +627,11 @@ typedef uint8_t xen_domain_handle_t[16];
+@@ -461,6 +629,11 @@ typedef uint8_t xen_domain_handle_t[16];
  #define __mk_unsigned_long(x) x ## UL
  #define mk_unsigned_long(x) __mk_unsigned_long(x)
  
@@ -5365,7 +5309,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  #else /* __ASSEMBLY__ */
  
  /* In assembly code we cannot use C numeric constant suffixes. */
-@@ -468,4 +639,24 @@ typedef uint8_t xen_domain_handle_t[16];
+@@ -468,4 +641,24 @@ typedef uint8_t xen_domain_handle_t[16];
  
  #endif /* !__ASSEMBLY__ */
  
@@ -5390,10 +5334,8 @@ Index: head-2008-11-25/include/xen/interface/xen.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-Index: head-2008-11-25/include/xen/xenbus.h
-===================================================================
---- head-2008-11-25.orig/include/xen/xenbus.h  2008-11-25 12:33:06.000000000 +0100
-+++ head-2008-11-25/include/xen/xenbus.h       2008-11-25 12:35:56.000000000 +0100
+--- sle11-2009-09-18.orig/include/xen/xenbus.h 2009-09-18 10:11:48.000000000 +0200
++++ sle11-2009-09-18/include/xen/xenbus.h      2008-11-25 12:35:56.000000000 +0100
 @@ -39,6 +39,7 @@
  #include <linux/mutex.h>
  #include <linux/completion.h>