[Linux-mips-commits]CVS: linux/include/asm-mips mipsregs.h,1.8,1.9

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv20204/include/asm-mips

Modified Files:
	mipsregs.h 
Log Message:
Sync with OSS (except for sysmips, which is waiting to be tested first).



Index: mipsregs.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/mipsregs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mipsregs.h	2001/10/24 23:32:54	1.8
+++ mipsregs.h	2001/10/27 17:28:55	1.9
@@ -273,7 +273,7 @@
  * Mostly used to access the interrupt bits.
  */
 #define __BUILD_SET_CP0(name,register)                          \
-extern __inline__ unsigned int                                  \
+extern inline unsigned int					\
 set_cp0_##name(unsigned int set)				\
 {                                                               \
 	unsigned int res;                                       \
@@ -285,7 +285,7 @@
 	return res;                                             \
 }								\
 								\
-extern __inline__ unsigned int                                  \
+extern inline unsigned int					\
 clear_cp0_##name(unsigned int clear)				\
 {                                                               \
 	unsigned int res;                                       \
@@ -297,7 +297,7 @@
 	return res;                                             \
 }								\
 								\
-extern __inline__ unsigned int                                  \
+extern inline unsigned int					\
 change_cp0_##name(unsigned int change, unsigned int new)	\
 {                                                               \
 	unsigned int res;                                       \
@@ -305,7 +305,6 @@
 	res = read_32bit_cp0_register(register);                \
 	res &= ~change;                                         \
 	res |= (new & change);                                  \
-	if(change)                                              \
 		write_32bit_cp0_register(register, res);        \
                                                                 \
 	return res;                                             \