diff options
Diffstat (limited to 'xen/arch/ia64/patch/linux-2.6.11/uaccess.h')
| -rw-r--r-- | xen/arch/ia64/patch/linux-2.6.11/uaccess.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/xen/arch/ia64/patch/linux-2.6.11/uaccess.h b/xen/arch/ia64/patch/linux-2.6.11/uaccess.h index def5aaac47..a81d3aec3f 100644 --- a/xen/arch/ia64/patch/linux-2.6.11/uaccess.h +++ b/xen/arch/ia64/patch/linux-2.6.11/uaccess.h @@ -1,6 +1,17 @@ ---- ../../linux-2.6.11/include/asm-ia64/uaccess.h 2005-06-06 10:36:23.000000000 -0600 -+++ include/asm-ia64/uaccess.h 2005-06-10 18:08:06.000000000 -0600 -@@ -60,6 +60,11 @@ +--- ../../linux-2.6.11/include/asm-ia64/uaccess.h 2005-03-02 00:37:53.000000000 -0700 ++++ include/asm-ia64/uaccess.h 2005-06-21 21:53:20.000000000 -0600 +@@ -32,6 +32,10 @@ + * David Mosberger-Tang <davidm@hpl.hp.com> + */ + ++#ifdef CONFIG_VTI ++#include <asm/vmx_uaccess.h> ++#else // CONFIG_VTI ++ + #include <linux/compiler.h> + #include <linux/errno.h> + #include <linux/sched.h> +@@ -60,6 +64,11 @@ * address TASK_SIZE is never valid. We also need to make sure that the address doesn't * point inside the virtually mapped linear page table. */ @@ -12,7 +23,7 @@ #define __access_ok(addr, size, segment) \ ({ \ __chk_user_ptr(addr); \ -@@ -67,6 +72,7 @@ +@@ -67,6 +76,7 @@ && ((segment).seg == KERNEL_DS.seg \ || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \ }) @@ -20,3 +31,11 @@ #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs()) static inline int +@@ -343,6 +353,7 @@ + __su_ret; \ + }) + ++#endif // CONFIG_VTI + /* Generic code can't deal with the location-relative format that we use for compactness. */ + #define ARCH_HAS_SORT_EXTABLE + #define ARCH_HAS_SEARCH_EXTABLE |