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-mips
/
types.h
diff --git
a/include/asm-mips/types.h
b/include/asm-mips/types.h
index
d2f0c76
..
cd2813d
100644
(file)
--- a/
include/asm-mips/types.h
+++ b/
include/asm-mips/types.h
@@
-78,7
+78,7
@@
typedef unsigned long long u64;
#endif
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
#endif
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
- || defined(CONFIG_
MIPS64
)
+ || defined(CONFIG_
64BIT
)
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t;
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t;
@@
-99,7
+99,10
@@
typedef u64 sector_t;
#define HAVE_SECTOR_T
#endif
#define HAVE_SECTOR_T
#endif
-typedef unsigned short kmem_bufctl_t;
+#ifdef CONFIG_LSF
+typedef u64 blkcnt_t;
+#define HAVE_BLKCNT_T
+#endif
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */