From 6d6f972f0c629ae76e531a9c2b6c57395370c871 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Apr 2003 04:53:09 -0800
Subject: [PATCH] [PATCH] stop even more macros for comverting compat pointers

Just want to nip this in the bud :-)
---
 arch/x86_64/ia32/sys_ia32.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 9ae80ec57f65f..3809473db6d48 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -75,7 +75,6 @@
 
 #define A(__x)		((unsigned long)(__x))
 #define AA(__x)		((unsigned long)(__x))
-#define u32_to_ptr(x)	((void *)(u64)(x))
 #define ROUND_UP(x,a)	((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
 #define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
 
@@ -2091,7 +2090,7 @@ long sys32_io_setup(unsigned nr_reqs, u32 *ctx32p)
 } 
 
 asmlinkage long sys32_io_submit(aio_context_t ctx_id, int nr,
-		   u32 *iocbpp)
+		   compat_uptr_t *iocbpp)
 {
 	struct kioctx *ctx;
 	long ret = 0;
@@ -2110,14 +2109,14 @@ asmlinkage long sys32_io_submit(aio_context_t ctx_id, int nr,
 	} 
 
 	for (i=0; i<nr; i++) {
-		u32 p32;
+		compat_uptr_t p32;
 		struct iocb *user_iocb, tmp;
 
 		if (unlikely(__get_user(p32, iocbpp + i))) {
 			ret = -EFAULT;
 			break;
-	} 
-		user_iocb = u32_to_ptr(p32);
+		} 
+		user_iocb = compat_ptr(p32);
 
 		if (unlikely(copy_from_user(&tmp, user_iocb, sizeof(tmp)))) {
 			ret = -EFAULT;
-- 
2.53.0