summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/bio.h6
-rw-r--r--include/linux/types.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index cfd241da..6528fe19 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -284,7 +284,7 @@ do { \
(dst)->bi_bdev = (src)->bi_bdev; \
} while (0)
-static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
+static inline void *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
{
return page_address(bvec->bv_page) + bvec->bv_offset;
}
@@ -294,14 +294,14 @@ static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
*flags = 0;
}
-static inline char *bvec_kmap_local(struct bio_vec *bvec)
+static inline void *bvec_kmap_local(struct bio_vec *bvec)
{
return page_address(bvec->bv_page) + bvec->bv_offset;
}
static inline void bvec_kunmap_local(char *buffer) {}
-static inline char *__bio_kmap_irq(struct bio *bio, struct bvec_iter iter,
+static inline void *__bio_kmap_irq(struct bio *bio, struct bvec_iter iter,
unsigned long *flags)
{
return bvec_kmap_irq(&bio_iter_iovec(bio, iter), flags);
diff --git a/include/linux/types.h b/include/linux/types.h
index 5ee5ebc6..a1473592 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -53,6 +53,12 @@ typedef __s16 s16;
typedef __u8 u8;
typedef __s8 s8;
+typedef unsigned char unchar;
+typedef unsigned short ushort;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+typedef unsigned long long ullong;
+
#ifdef __CHECKER__
#define __bitwise__ __attribute__((bitwise))
#else