--- zzzz-none-000/linux-2.6.13.1/arch/arm/nwfpe/fpa11_cpdt.c	2005-09-10 02:42:58.000000000 +0000
+++ ohio-7170-487/linux-2.6.13.1/arch/arm/nwfpe/fpa11_cpdt.c	2006-12-19 12:36:00.000000000 +0000
@@ -33,7 +33,7 @@
 {
 	FPA11 *fpa11 = GET_FPA11();
 	fpa11->fType[Fn] = typeSingle;
-	get_user(fpa11->fpreg[Fn].fSingle, pMem);
+	get_user(fpa11->fpreg[Fn].fSingle, (unsigned int __user *)pMem);
 }
 
 static inline void loadDouble(const unsigned int Fn, const unsigned int __user *pMem)
@@ -43,11 +43,11 @@
 	p = (unsigned int *) &fpa11->fpreg[Fn].fDouble;
 	fpa11->fType[Fn] = typeDouble;
 #ifdef __ARMEB__
-	get_user(p[0], &pMem[0]);	/* sign & exponent */
-	get_user(p[1], &pMem[1]);
+	get_user(p[0], (unsigned int __user *)&pMem[0]);	/* sign & exponent */
+	get_user(p[1], (unsigned int __user *)&pMem[1]);
 #else
-	get_user(p[0], &pMem[1]);
-	get_user(p[1], &pMem[0]);	/* sign & exponent */
+	get_user(p[0], (unsigned int __user *)&pMem[1]);
+	get_user(p[1], (unsigned int __user *)&pMem[0]);	/* sign & exponent */
 #endif
 }
 
@@ -58,9 +58,9 @@
 	unsigned int *p;
 	p = (unsigned int *) &fpa11->fpreg[Fn].fExtended;
 	fpa11->fType[Fn] = typeExtended;
-	get_user(p[0], &pMem[0]);	/* sign & exponent */
-	get_user(p[1], &pMem[2]);	/* ls bits */
-	get_user(p[2], &pMem[1]);	/* ms bits */
+	get_user(p[0], (unsigned int __user *)&pMem[0]);	/* sign & exponent */
+	get_user(p[1], (unsigned int __user *)&pMem[2]);	/* ls bits */
+	get_user(p[2], (unsigned int __user *)&pMem[1]);	/* ms bits */
 }
 #endif
 
@@ -71,15 +71,15 @@
 	unsigned long x;
 
 	p = (unsigned int *) &(fpa11->fpreg[Fn]);
-	get_user(x, &pMem[0]);
+	get_user(x, (unsigned int __user *)&pMem[0]);
 	fpa11->fType[Fn] = (x >> 14) & 0x00000003;
 
 	switch (fpa11->fType[Fn]) {
 	case typeSingle:
 	case typeDouble:
 		{
-			get_user(p[0], &pMem[2]);	/* Single */
-			get_user(p[1], &pMem[1]);	/* double msw */
+			get_user(p[0], (unsigned int __user *)&pMem[2]);	/* Single */
+			get_user(p[1], (unsigned int __user *)&pMem[1]);	/* double msw */
 			p[2] = 0;			/* empty */
 		}
 		break;
@@ -87,8 +87,8 @@
 #ifdef CONFIG_FPE_NWFPE_XP
 	case typeExtended:
 		{
-			get_user(p[1], &pMem[2]);
-			get_user(p[2], &pMem[1]);	/* msw */
+			get_user(p[1], (unsigned int __user *)&pMem[2]);
+			get_user(p[2], (unsigned int __user *)&pMem[1]);	/* msw */
 			p[0] = (x & 0x80003fff);
 		}
 		break;