diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:22:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:16:51 -0700 |
commit | b4e3ca1ab1ae9ae86134126dcdc88da1caaa32ca (patch) | |
tree | 51c609f9a954cd5d4732c4b512f9ff2e19546d47 /include/linux | |
parent | 9e24974db6b01ec067c24de09588282b6a1407f0 (diff) | |
download | op-kernel-dev-b4e3ca1ab1ae9ae86134126dcdc88da1caaa32ca.zip op-kernel-dev-b4e3ca1ab1ae9ae86134126dcdc88da1caaa32ca.tar.gz |
[PATCH] gfp_t: remaining bits of drivers/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/i2o.h | 4 | ||||
-rw-r--r-- | include/linux/loop.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/i2o.h b/include/linux/i2o.h index bdc286e..b4af45aa 100644 --- a/include/linux/i2o.h +++ b/include/linux/i2o.h @@ -492,7 +492,7 @@ static inline int i2o_dma_map_sg(struct i2o_controller *c, * Returns 0 on success or -ENOMEM on failure. */ static inline int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, - size_t len, unsigned int gfp_mask) + size_t len, gfp_t gfp_mask) { struct pci_dev *pdev = to_pci_dev(dev); int dma_64 = 0; @@ -551,7 +551,7 @@ static inline void i2o_dma_free(struct device *dev, struct i2o_dma *addr) * Returns the 0 on success or negative error code on failure. */ static inline int i2o_dma_realloc(struct device *dev, struct i2o_dma *addr, - size_t len, unsigned int gfp_mask) + size_t len, gfp_t gfp_mask) { i2o_dma_free(dev, addr); diff --git a/include/linux/loop.h b/include/linux/loop.h index 53fa515..40f63c9 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h @@ -52,7 +52,7 @@ struct loop_device { unsigned lo_blocksize; void *key_data; - int old_gfp_mask; + gfp_t old_gfp_mask; spinlock_t lo_lock; struct bio *lo_bio; |