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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
nwfpe
/
fpmodule.inl
diff --git
a/arch/arm/nwfpe/fpmodule.inl
b/arch/arm/nwfpe/fpmodule.inl
index
119fb3f
..
2c39ad4
100644
(file)
--- a/
arch/arm/nwfpe/fpmodule.inl
+++ b/
arch/arm/nwfpe/fpmodule.inl
@@
-19,8
+19,7
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-extern __inline__
-unsigned int readRegister(const unsigned int nReg)
+static inline unsigned long readRegister(const unsigned int nReg)
{
/* Note: The CPU thinks it has dealt with the current instruction.
As a result the program counter has been advanced to the next
{
/* Note: The CPU thinks it has dealt with the current instruction.
As a result the program counter has been advanced to the next
@@
-29,34
+28,31
@@
unsigned int readRegister(const unsigned int nReg)
for this in this routine. LDF/STF instructions with Rn = PC
depend on the PC being correct, as they use PC+8 in their
address calculations. */
for this in this routine. LDF/STF instructions with Rn = PC
depend on the PC being correct, as they use PC+8 in their
address calculations. */
-
unsigned int *userRegister
s = GET_USERREG();
- unsigned int val =
userRegister
s[nReg];
+
struct pt_regs *reg
s = GET_USERREG();
+ unsigned int val =
regs->ureg
s[nReg];
if (REG_PC == nReg)
val -= 4;
return val;
}
if (REG_PC == nReg)
val -= 4;
return val;
}
-extern __inline__
-
void writeRegister(const unsigned int nReg, const unsigned int
val)
+static inline void
+
writeRegister(const unsigned int nReg, const unsigned long
val)
{
{
-
unsigned int *userRegister
s = GET_USERREG();
-
userRegister
s[nReg] = val;
+
struct pt_regs *reg
s = GET_USERREG();
+
regs->ureg
s[nReg] = val;
}
}
-extern __inline__
-unsigned int readCPSR(void)
+static inline unsigned long readCPSR(void)
{
return (readRegister(REG_CPSR));
}
{
return (readRegister(REG_CPSR));
}
-extern __inline__
-void writeCPSR(const unsigned int val)
+static inline void writeCPSR(const unsigned long val)
{
writeRegister(REG_CPSR, val);
}
{
writeRegister(REG_CPSR, val);
}
-extern __inline__
-unsigned int readConditionCodes(void)
+static inline unsigned long readConditionCodes(void)
{
#ifdef __FPEM_TEST__
return (0);
{
#ifdef __FPEM_TEST__
return (0);
@@
-65,21
+61,14
@@
unsigned int readConditionCodes(void)
#endif
}
#endif
}
-extern __inline__
-void writeConditionCodes(const unsigned int val)
+static inline void writeConditionCodes(const unsigned long val)
{
{
-
unsigned int *userRegister
s = GET_USERREG();
- unsigned
int
rval;
+
struct pt_regs *reg
s = GET_USERREG();
+ unsigned
long
rval;
/*
* Operate directly on userRegisters since
* the CPSR may be the PC register itself.
*/
/*
* Operate directly on userRegisters since
* the CPSR may be the PC register itself.
*/
- rval = userRegisters[REG_CPSR] & ~CC_MASK;
- userRegisters[REG_CPSR] = rval | (val & CC_MASK);
-}
-
-extern __inline__
-unsigned int readMemoryInt(unsigned int *pMem)
-{
- return *pMem;
+ rval = regs->ARM_cpsr & ~CC_MASK;
+ regs->ARM_cpsr = rval | (val & CC_MASK);
}
}