ia64/xen-unstable

changeset 7028:b6ee1d1cdc93

Minor drivers/xen changes and includes to support xenlinux/ia64
author djm@kirby.fc.hp.com
date Thu Sep 22 12:06:33 2005 -0600 (2005-09-22)
parents 06d84bf87159
children ecd6b2163193 43edce5b75d6
files linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c linux-2.6-xen-sparse/drivers/xen/console/console.c linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c	Thu Sep 22 11:42:01 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c	Thu Sep 22 12:06:33 2005 -0600
     1.3 @@ -14,6 +14,7 @@
     1.4  #include <linux/module.h>
     1.5  #include <linux/sched.h>
     1.6  #include <asm/pgtable.h>
     1.7 +#include <asm-xen/xen-public/xen.h>
     1.8  #include <asm/fixmap.h>
     1.9  #include <asm/uaccess.h>
    1.10  #include <asm-xen/xen_proc.h>
    1.11 @@ -435,6 +436,9 @@ gnttab_init(void)
    1.12  {
    1.13      int i;
    1.14  
    1.15 +    if (xen_init() < 0)
    1.16 +        return -ENODEV;
    1.17 +
    1.18      BUG_ON(gnttab_resume());
    1.19  
    1.20      shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Thu Sep 22 11:42:01 2005 -0600
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Thu Sep 22 12:06:33 2005 -0600
     2.3 @@ -691,6 +691,9 @@ static int __init xencons_init(void)
     2.4  {
     2.5  	int rc;
     2.6  
     2.7 +	if (xen_init() < 0)
     2.8 +		return -ENODEV;
     2.9 +
    2.10  	if (xc_mode == XC_OFF)
    2.11  		return 0;
    2.12  
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Thu Sep 22 11:42:01 2005 -0600
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Thu Sep 22 12:06:33 2005 -0600
     3.3 @@ -25,6 +25,8 @@
     3.4  #include <asm/pgtable.h>
     3.5  #include <asm/uaccess.h>
     3.6  #include <asm/tlb.h>
     3.7 +#include <asm-xen/xen-public/xen.h>
     3.8 +#include <asm/hypervisor.h>
     3.9  #include <asm-xen/linux-public/privcmd.h>
    3.10  #include <asm/hypervisor.h>
    3.11  #include <asm-xen/xen-public/xen.h>
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Thu Sep 22 11:42:01 2005 -0600
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Thu Sep 22 12:06:33 2005 -0600
     4.3 @@ -43,6 +43,7 @@
     4.4  #include <asm/hypervisor.h>
     4.5  #include <asm-xen/xenbus.h>
     4.6  #include <asm-xen/xen_proc.h>
     4.7 +#include <asm/hypervisor.h>
     4.8  #include <asm-xen/linux-public/xenstored.h>
     4.9  
    4.10  struct xenbus_dev_data {
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Thu Sep 22 11:42:01 2005 -0600
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Thu Sep 22 12:06:33 2005 -0600
     5.3 @@ -674,6 +674,9 @@ int do_xenbus_probe(void *unused)
     5.4  
     5.5  static int __init xenbus_probe_init(void)
     5.6  {
     5.7 +	if (xen_init() < 0)
     5.8 +		return -ENODEV;
     5.9 +
    5.10  	bus_register(&xenbus_frontend.bus);
    5.11  	bus_register(&xenbus_backend.bus);
    5.12  	device_register(&xenbus_frontend.dev);
     6.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h	Thu Sep 22 11:42:01 2005 -0600
     6.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h	Thu Sep 22 12:06:33 2005 -0600
     6.3 @@ -140,6 +140,8 @@ void xen_destroy_contiguous_region(unsig
     6.4  #define MULTI_UVMDOMID_INDEX 4
     6.5  #endif
     6.6  
     6.7 +#define xen_init()	(0)
     6.8 +
     6.9  static inline void
    6.10  MULTI_update_va_mapping(
    6.11      multicall_entry_t *mcl, unsigned long va,