diff options
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/mm/sun4c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 95070a1e1b7b..fe65aeeb3947 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
| @@ -1108,7 +1108,7 @@ static void sun4c_unlockarea(char *vaddr, unsigned long size) | |||
| 1108 | * by implication and fool the page locking code above | 1108 | * by implication and fool the page locking code above |
| 1109 | * if passed to by mistake. | 1109 | * if passed to by mistake. |
| 1110 | */ | 1110 | */ |
| 1111 | static __u32 sun4c_get_scsi_one(char *bufptr, unsigned long len, struct sbus_bus *sbus) | 1111 | static __u32 sun4c_get_scsi_one(struct device *dev, char *bufptr, unsigned long len) |
| 1112 | { | 1112 | { |
| 1113 | unsigned long page; | 1113 | unsigned long page; |
| 1114 | 1114 | ||
| @@ -1120,7 +1120,7 @@ static __u32 sun4c_get_scsi_one(char *bufptr, unsigned long len, struct sbus_bus | |||
| 1120 | return (__u32)sun4c_lockarea(bufptr, len); | 1120 | return (__u32)sun4c_lockarea(bufptr, len); |
| 1121 | } | 1121 | } |
| 1122 | 1122 | ||
| 1123 | static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus) | 1123 | static void sun4c_get_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz) |
| 1124 | { | 1124 | { |
| 1125 | while (sz != 0) { | 1125 | while (sz != 0) { |
| 1126 | --sz; | 1126 | --sz; |
| @@ -1130,14 +1130,14 @@ static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus * | |||
| 1130 | } | 1130 | } |
| 1131 | } | 1131 | } |
| 1132 | 1132 | ||
| 1133 | static void sun4c_release_scsi_one(__u32 bufptr, unsigned long len, struct sbus_bus *sbus) | 1133 | static void sun4c_release_scsi_one(struct device *dev, __u32 bufptr, unsigned long len) |
| 1134 | { | 1134 | { |
| 1135 | if (bufptr < sun4c_iobuffer_start) | 1135 | if (bufptr < sun4c_iobuffer_start) |
| 1136 | return; /* On kernel stack or similar, see above */ | 1136 | return; /* On kernel stack or similar, see above */ |
| 1137 | sun4c_unlockarea((char *)bufptr, len); | 1137 | sun4c_unlockarea((char *)bufptr, len); |
| 1138 | } | 1138 | } |
| 1139 | 1139 | ||
| 1140 | static void sun4c_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus) | 1140 | static void sun4c_release_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz) |
| 1141 | { | 1141 | { |
| 1142 | while (sz != 0) { | 1142 | while (sz != 0) { |
| 1143 | --sz; | 1143 | --sz; |
