diff options
author | Keir Fraser <keir@xensource.com> | 2007-04-04 21:49:04 +0100 |
---|---|---|
committer | Keir Fraser <keir@xensource.com> | 2007-04-04 21:49:04 +0100 |
commit | ed34f48aa862eafac4269a5dcdac8ac564297277 (patch) | |
tree | c4a00c549ef7dcb3ef6c2d8b66784303bfb50be4 /unmodified_drivers | |
parent | 1d3e27e802686c099d3b4661668d0bfbd9026a42 (diff) | |
download | xen-ed34f48aa862eafac4269a5dcdac8ac564297277.tar.gz xen-ed34f48aa862eafac4269a5dcdac8ac564297277.tar.bz2 xen-ed34f48aa862eafac4269a5dcdac8ac564297277.zip |
Various cleanups and fixes for PV-on-HVM drivers.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'unmodified_drivers')
-rw-r--r-- | unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h | 8 | ||||
-rwxr-xr-x | unmodified_drivers/linux-2.6/mkbuildtree | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h index 7493ddf382..d327d703ea 100644 --- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h +++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h @@ -25,6 +25,10 @@ #define NET_IP_ALIGN 0 #endif +#if defined(_LINUX_SKBUFF_H) && !defined(CHECKSUM_HW) +#define CHECKSUM_HW CHECKSUM_PARTIAL +#endif + #if defined(_LINUX_ERR_H) && !defined(IS_ERR_VALUE) #define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L) #endif @@ -76,6 +80,10 @@ extern char *kasprintf(gfp_t gfp, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); #endif +#if defined(_LINUX_SYSRQ_H) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18) +#define handle_sysrq(x,y,z) handle_sysrq(x,y) +#endif + /* * This variable at present is referenced by netfront, but only in code that * is dead when running in hvm guests. To detect potential active uses of it diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree index 31415928cd..b12da9b086 100755 --- a/unmodified_drivers/linux-2.6/mkbuildtree +++ b/unmodified_drivers/linux-2.6/mkbuildtree @@ -50,7 +50,6 @@ i[34567]86) ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypercall.h include/asm ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm - ln -sf ${XL}/include/asm-i386/mach-xen/asm/page.h include/asm ;; "ia64") ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm |