[Xen-changelog] Minor drivers/xen changes and includes to support xenlinux/ia64

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID b6ee1d1cdc9336f9de595af7357d413419605117
# Parent  06d84bf87159174ef040a67f4ce90fcb72469b14
Minor drivers/xen changes and includes to support xenlinux/ia64

diff -r 06d84bf87159 -r b6ee1d1cdc93 
linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c     Thu Sep 22 17:42:01 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c     Thu Sep 22 18:06:33 2005
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/pgtable.h>
+#include <asm-xen/xen-public/xen.h>
 #include <asm/fixmap.h>
 #include <asm/uaccess.h>
 #include <asm-xen/xen_proc.h>
@@ -435,6 +436,9 @@
 {
     int i;
 
+    if (xen_init() < 0)
+        return -ENODEV;
+
     BUG_ON(gnttab_resume());
 
     shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
diff -r 06d84bf87159 -r b6ee1d1cdc93 
linux-2.6-xen-sparse/drivers/xen/console/console.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c        Thu Sep 22 
17:42:01 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c        Thu Sep 22 
18:06:33 2005
@@ -691,6 +691,9 @@
 {
        int rc;
 
+       if (xen_init() < 0)
+               return -ENODEV;
+
        if (xc_mode == XC_OFF)
                return 0;
 
diff -r 06d84bf87159 -r b6ee1d1cdc93 
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c        Thu Sep 22 
17:42:01 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c        Thu Sep 22 
18:06:33 2005
@@ -25,6 +25,8 @@
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
+#include <asm-xen/xen-public/xen.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/linux-public/privcmd.h>
 #include <asm/hypervisor.h>
 #include <asm-xen/xen-public/xen.h>
diff -r 06d84bf87159 -r b6ee1d1cdc93 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c      Thu Sep 22 
17:42:01 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c      Thu Sep 22 
18:06:33 2005
@@ -43,6 +43,7 @@
 #include <asm/hypervisor.h>
 #include <asm-xen/xenbus.h>
 #include <asm-xen/xen_proc.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/linux-public/xenstored.h>
 
 struct xenbus_dev_data {
diff -r 06d84bf87159 -r b6ee1d1cdc93 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Thu Sep 22 
17:42:01 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Thu Sep 22 
18:06:33 2005
@@ -674,6 +674,9 @@
 
 static int __init xenbus_probe_init(void)
 {
+       if (xen_init() < 0)
+               return -ENODEV;
+
        bus_register(&xenbus_frontend.bus);
        bus_register(&xenbus_backend.bus);
        device_register(&xenbus_frontend.dev);
diff -r 06d84bf87159 -r b6ee1d1cdc93 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h        Thu Sep 
22 17:42:01 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h        Thu Sep 
22 18:06:33 2005
@@ -140,6 +140,8 @@
 #define MULTI_UVMDOMID_INDEX 4
 #endif
 
+#define xen_init()     (0)
+
 static inline void
 MULTI_update_va_mapping(
     multicall_entry_t *mcl, unsigned long va,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog