diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-09-24 21:55:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 23:07:49 -0400 |
commit | 3cc27547d6ee2d50ecdd11e9127bc3cd1947e8dd (patch) | |
tree | d70857f363fea3f8bc928bd2fd10d9a277c119bd /drivers/scsi/aic94xx/aic94xx_hwi.h | |
parent | 855fc73bf81e8f99606d6f5914c5b7c3b079d718 (diff) |
[PATCH] SCSI gfp_t annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_hwi.h')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_hwi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.h b/drivers/scsi/aic94xx/aic94xx_hwi.h index c7d505388fed..8498144aa5e1 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.h +++ b/drivers/scsi/aic94xx/aic94xx_hwi.h | |||
@@ -242,7 +242,7 @@ struct asd_ha_struct { | |||
242 | 242 | ||
243 | /* ---------- DMA allocs ---------- */ | 243 | /* ---------- DMA allocs ---------- */ |
244 | 244 | ||
245 | static inline struct asd_dma_tok *asd_dmatok_alloc(unsigned int flags) | 245 | static inline struct asd_dma_tok *asd_dmatok_alloc(gfp_t flags) |
246 | { | 246 | { |
247 | return kmem_cache_alloc(asd_dma_token_cache, flags); | 247 | return kmem_cache_alloc(asd_dma_token_cache, flags); |
248 | } | 248 | } |
@@ -254,7 +254,7 @@ static inline void asd_dmatok_free(struct asd_dma_tok *token) | |||
254 | 254 | ||
255 | static inline struct asd_dma_tok *asd_alloc_coherent(struct asd_ha_struct * | 255 | static inline struct asd_dma_tok *asd_alloc_coherent(struct asd_ha_struct * |
256 | asd_ha, size_t size, | 256 | asd_ha, size_t size, |
257 | unsigned int flags) | 257 | gfp_t flags) |
258 | { | 258 | { |
259 | struct asd_dma_tok *token = asd_dmatok_alloc(flags); | 259 | struct asd_dma_tok *token = asd_dmatok_alloc(flags); |
260 | if (token) { | 260 | if (token) { |
@@ -376,7 +376,7 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id, struct pt_regs *regs); | |||
376 | 376 | ||
377 | struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct | 377 | struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct |
378 | *asd_ha, int *num, | 378 | *asd_ha, int *num, |
379 | unsigned int gfp_mask); | 379 | gfp_t gfp_mask); |
380 | 380 | ||
381 | int asd_post_ascb_list(struct asd_ha_struct *asd_ha, struct asd_ascb *ascb, | 381 | int asd_post_ascb_list(struct asd_ha_struct *asd_ha, struct asd_ascb *ascb, |
382 | int num); | 382 | int num); |