git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add cmpxchg_local to asm-generic for per cpu atomic operations
[safe/jmp/linux-2.6]
/
include
/
asm-m32r
/
types.h
diff --git
a/include/asm-m32r/types.h
b/include/asm-m32r/types.h
index
fcf24c6
..
b64c166
100644
(file)
--- a/
include/asm-m32r/types.h
+++ b/
include/asm-m32r/types.h
@@
-3,10
+3,6
@@
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
typedef unsigned short umode_t;
/*
typedef unsigned short umode_t;
/*
@@
-23,9
+19,9
@@
typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__)
&& !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+
__extension__
typedef __signed__ long long __s64;
+
__extension__
typedef unsigned long long __u64;
#endif
#endif /* __ASSEMBLY__ */
#endif
#endif /* __ASSEMBLY__ */
@@
-59,4
+55,4
@@
typedef u64 dma64_addr_t;
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */
-#endif
/* _ASM_M32R_TYPES_H */
+#endif /* _ASM_M32R_TYPES_H */