git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
arm
/
nwfpe
/
fpa11_cpdt.c
diff --git
a/arch/arm/nwfpe/fpa11_cpdt.c
b/arch/arm/nwfpe/fpa11_cpdt.c
index
2ad4575
..
59e3197
100644
(file)
--- a/
arch/arm/nwfpe/fpa11_cpdt.c
+++ b/
arch/arm/nwfpe/fpa11_cpdt.c
@@
-29,14
+29,14
@@
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-static inline void loadSingle(const unsigned int Fn, const unsigned int
__user
*pMem)
+static inline void loadSingle(const unsigned int Fn, const unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
fpa11->fType[Fn] = typeSingle;
get_user(fpa11->fpreg[Fn].fSingle, pMem);
}
{
FPA11 *fpa11 = GET_FPA11();
fpa11->fType[Fn] = typeSingle;
get_user(fpa11->fpreg[Fn].fSingle, pMem);
}
-static inline void loadDouble(const unsigned int Fn, const unsigned int
__user
*pMem)
+static inline void loadDouble(const unsigned int Fn, const unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
unsigned int *p;
{
FPA11 *fpa11 = GET_FPA11();
unsigned int *p;
@@
-47,7
+47,7
@@
static inline void loadDouble(const unsigned int Fn, const unsigned int __user *
}
#ifdef CONFIG_FPE_NWFPE_XP
}
#ifdef CONFIG_FPE_NWFPE_XP
-static inline void loadExtended(const unsigned int Fn, const unsigned int
__user
*pMem)
+static inline void loadExtended(const unsigned int Fn, const unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
unsigned int *p;
{
FPA11 *fpa11 = GET_FPA11();
unsigned int *p;
@@
-59,7
+59,7
@@
static inline void loadExtended(const unsigned int Fn, const unsigned int __user
}
#endif
}
#endif
-static inline void loadMultiple(const unsigned int Fn, const unsigned int
__user
*pMem)
+static inline void loadMultiple(const unsigned int Fn, const unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
register unsigned int *p;
{
FPA11 *fpa11 = GET_FPA11();
register unsigned int *p;
@@
-91,7
+91,7
@@
static inline void loadMultiple(const unsigned int Fn, const unsigned int __user
}
}
}
}
-static inline void storeSingle(const unsigned int Fn, unsigned int
__user
*pMem)
+static inline void storeSingle(const unsigned int Fn, unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
union {
{
FPA11 *fpa11 = GET_FPA11();
union {
@@
-117,7
+117,7
@@
static inline void storeSingle(const unsigned int Fn, unsigned int __user *pMem)
put_user(val.i[0], pMem);
}
put_user(val.i[0], pMem);
}
-static inline void storeDouble(const unsigned int Fn, unsigned int
__user
*pMem)
+static inline void storeDouble(const unsigned int Fn, unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
union {
{
FPA11 *fpa11 = GET_FPA11();
union {
@@
-145,7
+145,7
@@
static inline void storeDouble(const unsigned int Fn, unsigned int __user *pMem)
}
#ifdef CONFIG_FPE_NWFPE_XP
}
#ifdef CONFIG_FPE_NWFPE_XP
-static inline void storeExtended(const unsigned int Fn, unsigned int
__user
*pMem)
+static inline void storeExtended(const unsigned int Fn, unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
union {
{
FPA11 *fpa11 = GET_FPA11();
union {
@@
-172,7
+172,7
@@
static inline void storeExtended(const unsigned int Fn, unsigned int __user *pMe
}
#endif
}
#endif
-static inline void storeMultiple(const unsigned int Fn, unsigned int
__user
*pMem)
+static inline void storeMultiple(const unsigned int Fn, unsigned int *pMem)
{
FPA11 *fpa11 = GET_FPA11();
register unsigned int nType, *p;
{
FPA11 *fpa11 = GET_FPA11();
register unsigned int nType, *p;
@@
-204,10
+204,10
@@
static inline void storeMultiple(const unsigned int Fn, unsigned int __user *pMe
unsigned int PerformLDF(const unsigned int opcode)
{
unsigned int PerformLDF(const unsigned int opcode)
{
- unsigned int
__user *pBase, *pAddress, *pFinal;
-
unsigned int nRc = 1,
write_back = WRITE_BACK(opcode);
+ unsigned int
*pBase, *pAddress, *pFinal, nRc = 1,
+
write_back = WRITE_BACK(opcode);
- pBase = (unsigned int
__user
*) readRegister(getRn(opcode));
+ pBase = (unsigned int *) readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
@@
-241,18
+241,18
@@
unsigned int PerformLDF(const unsigned int opcode)
}
if (write_back)
}
if (write_back)
- writeRegister(getRn(opcode), (unsigned
long
) pFinal);
+ writeRegister(getRn(opcode), (unsigned
int
) pFinal);
return nRc;
}
unsigned int PerformSTF(const unsigned int opcode)
{
return nRc;
}
unsigned int PerformSTF(const unsigned int opcode)
{
- unsigned int
__user *pBase, *pAddress, *pFinal;
-
unsigned int nRc = 1,
write_back = WRITE_BACK(opcode);
+ unsigned int
*pBase, *pAddress, *pFinal, nRc = 1,
+
write_back = WRITE_BACK(opcode);
SetRoundingMode(ROUND_TO_NEAREST);
SetRoundingMode(ROUND_TO_NEAREST);
- pBase = (unsigned int
__user
*) readRegister(getRn(opcode));
+ pBase = (unsigned int *) readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
@@
-286,16
+286,16
@@
unsigned int PerformSTF(const unsigned int opcode)
}
if (write_back)
}
if (write_back)
- writeRegister(getRn(opcode), (unsigned
long
) pFinal);
+ writeRegister(getRn(opcode), (unsigned
int
) pFinal);
return nRc;
}
unsigned int PerformLFM(const unsigned int opcode)
{
return nRc;
}
unsigned int PerformLFM(const unsigned int opcode)
{
- unsigned int
__user *pBase, *pAddress, *pFinal;
-
unsigned int i, Fd,
write_back = WRITE_BACK(opcode);
+ unsigned int
i, Fd, *pBase, *pAddress, *pFinal,
+
write_back = WRITE_BACK(opcode);
- pBase = (unsigned int
__user
*) readRegister(getRn(opcode));
+ pBase = (unsigned int *) readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
@@
-322,16
+322,16
@@
unsigned int PerformLFM(const unsigned int opcode)
}
if (write_back)
}
if (write_back)
- writeRegister(getRn(opcode), (unsigned
long
) pFinal);
+ writeRegister(getRn(opcode), (unsigned
int
) pFinal);
return 1;
}
unsigned int PerformSFM(const unsigned int opcode)
{
return 1;
}
unsigned int PerformSFM(const unsigned int opcode)
{
- unsigned int
__user *pBase, *pAddress, *pFinal;
-
unsigned int i, Fd,
write_back = WRITE_BACK(opcode);
+ unsigned int
i, Fd, *pBase, *pAddress, *pFinal,
+
write_back = WRITE_BACK(opcode);
- pBase = (unsigned int
__user
*) readRegister(getRn(opcode));
+ pBase = (unsigned int *) readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
if (REG_PC == getRn(opcode)) {
pBase += 2;
write_back = 0;
@@
-358,7
+358,7
@@
unsigned int PerformSFM(const unsigned int opcode)
}
if (write_back)
}
if (write_back)
- writeRegister(getRn(opcode), (unsigned
long
) pFinal);
+ writeRegister(getRn(opcode), (unsigned
int
) pFinal);
return 1;
}
return 1;
}