diff options
| author | Alexander Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2004-11-20 21:13:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-20 21:13:07 -0800 |
| commit | fc396d726fa5ddc5d593e2b13d525ae2eb4628fc (patch) | |
| tree | 4d20d244ddb8bc22ce2dbc1af2eaa55cea1f92d8 /include/linux | |
| parent | 8fe11cd89eeaec0a6e26f82e3ee355be599cf09f (diff) | |
[PATCH] i2o iomem annotations
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2o.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/i2o.h b/include/linux/i2o.h index b8fc7587498a..777a80f9f4a3 100644 --- a/include/linux/i2o.h +++ b/include/linux/i2o.h @@ -162,9 +162,9 @@ struct i2o_controller { struct notifier_block *event_notifer; /* Events */ atomic_t users; struct list_head list; /* Controller list */ - void *post_port; /* Inbout port address */ - void *reply_port; /* Outbound port address */ - void *irq_mask; /* Interrupt register address */ + void __iomem *post_port; /* Inbout port address */ + void __iomem *reply_port; /* Outbound port address */ + void __iomem *irq_mask; /* Interrupt register address */ /* Dynamic LCT related data */ @@ -241,8 +241,8 @@ struct i2o_sys_tbl { extern struct list_head i2o_controllers; /* Message functions */ -static inline u32 i2o_msg_get(struct i2o_controller *, struct i2o_message **); -extern u32 i2o_msg_get_wait(struct i2o_controller *, struct i2o_message **, +static inline u32 i2o_msg_get(struct i2o_controller *, struct i2o_message __iomem **); +extern u32 i2o_msg_get_wait(struct i2o_controller *, struct i2o_message __iomem **, int); static inline void i2o_msg_post(struct i2o_controller *, u32); static inline int i2o_msg_post_wait(struct i2o_controller *, u32, @@ -443,7 +443,7 @@ static inline void I2O_IRQ_WRITE32(struct i2o_controller *c, u32 val) * available returns I2O_QUEUE_EMPTY and msg is leaved untouched. */ static inline u32 i2o_msg_get(struct i2o_controller *c, - struct i2o_message **msg) + struct i2o_message __iomem **msg) { u32 m; @@ -530,7 +530,7 @@ static inline struct i2o_message *i2o_msg_out_to_virt(struct i2o_controller *c, * work for receive side messages as they are kmalloc objects * in a different pool. */ -static inline struct i2o_message *i2o_msg_in_to_virt(struct i2o_controller *c, +static inline struct i2o_message __iomem *i2o_msg_in_to_virt(struct i2o_controller *c, u32 m) { return c->in_queue.virt + m; |