diff options
| author | Ian Campbell <ian.campbell@xensource.com> | 2006-11-02 11:56:26 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@xensource.com> | 2006-11-02 11:56:26 +0000 |
| commit | d8656aaa3e9c089e3fb49a8bcd5ecccc1d6ce1eb (patch) | |
| tree | 11f0adea000e8df533712d6aaae4f5acaa17508a /unmodified_drivers | |
| parent | 0d7658072aa628260f075d2ef45ef1b2558a577c (diff) | |
| download | xen-d8656aaa3e9c089e3fb49a8bcd5ecccc1d6ce1eb.tar.gz xen-d8656aaa3e9c089e3fb49a8bcd5ecccc1d6ce1eb.tar.bz2 xen-d8656aaa3e9c089e3fb49a8bcd5ecccc1d6ce1eb.zip | |
PV-on-HVM: Fix PV-on-HVM drivers for IA64.
Thanks to Kasai Takanori and Doi Tsunehisa for testing.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Diffstat (limited to 'unmodified_drivers')
| -rw-r--r-- | unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h | 1 | ||||
| -rw-r--r-- | unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h b/unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h index 8b23299dd0..05c9675760 100644 --- a/unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h +++ b/unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h @@ -9,6 +9,7 @@ #define pud_offset(d, va) d #define pud_none(pud) 0 #define pud_present(pud) 1 +#define pud_bad(pud) 0 #define PTRS_PER_PUD 1 #endif /* _PGTABLE_NOPUD_H */ 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 4978c63610..ea0e6b308f 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,21 @@ #define NET_IP_ALIGN 0 #endif +#if defined(_LINUX_ERR_H) && !defined(IS_ERR_VALUE) +#define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L) +#endif + +#if defined(_ASM_IA64_PGTABLE_H) && !defined(_PGTABLE_NOPUD_H) +#include <asm-generic/pgtable-nopud.h> +#endif + +/* Some kernels have this typedef backported so we cannot reliably + * detect based on version number, hence we forcibly #define it. + */ +#if defined(__LINUX_TYPES_H) || defined(__LINUX_GFP_H) +#define gfp_t unsigned +#endif + #if defined(_LINUX_FS_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) #define nonseekable_open(inode, filp) /* Nothing to do */ #endif |