projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
[powerpc.git]
/
include
/
asm-ia64
/
compat.h
diff --git
a/include/asm-ia64/compat.h
b/include/asm-ia64/compat.h
index
c0b1910
..
0f6e526
100644
(file)
--- a/
include/asm-ia64/compat.h
+++ b/
include/asm-ia64/compat.h
@@
-31,8
+31,10
@@
typedef s32 compat_timer_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
+typedef s64 __attribute__((aligned(4))) compat_s64;
typedef u32 compat_uint_t;
typedef u32 compat_ulong_t;
typedef u32 compat_uint_t;
typedef u32 compat_ulong_t;
+typedef u64 __attribute__((aligned(4))) compat_u64;
struct compat_timespec {
compat_time_t tv_sec;
struct compat_timespec {
compat_time_t tv_sec;
@@
-189,6
+191,12
@@
compat_ptr (compat_uptr_t uptr)
return (void __user *) (unsigned long) uptr;
}
return (void __user *) (unsigned long) uptr;
}
+static inline compat_uptr_t
+ptr_to_compat(void __user *uptr)
+{
+ return (u32)(unsigned long)uptr;
+}
+
static __inline__ void __user *
compat_alloc_user_space (long len)
{
static __inline__ void __user *
compat_alloc_user_space (long len)
{