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]
/
include
/
asm-s390
/
types.h
diff --git
a/include/asm-s390/types.h
b/include/asm-s390/types.h
index
3fefd61
..
5738ad6
100644
(file)
--- a/
include/asm-s390/types.h
+++ b/
include/asm-s390/types.h
@@
-79,8
+79,6
@@
typedef unsigned long u64;
typedef u32 dma_addr_t;
typedef u32 dma_addr_t;
-typedef unsigned int kmem_bufctl_t;
-
#ifndef __s390x__
typedef union {
unsigned long long pair;
#ifndef __s390x__
typedef union {
unsigned long long pair;
@@
-95,6
+93,11
@@
typedef u64 sector_t;
#define HAVE_SECTOR_T
#endif
#define HAVE_SECTOR_T
#endif
+#ifdef CONFIG_LSF
+typedef u64 blkcnt_t;
+#define HAVE_BLKCNT_T
+#endif
+
#endif /* ! __s390x__ */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* ! __s390x__ */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */