Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/lib/io.c b/arch/arm/lib/io.c
index a7720eca1..198633edd 100644
--- a/arch/arm/lib/io.c
+++ b/arch/arm/lib/io.c
@@ -1,4 +1,5 @@
 #include <linux/module.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 
@@ -6,7 +7,7 @@
  * Copy data from IO memory space to "real" memory space.
  * This needs to be optimized.
  */
-void _memcpy_fromio(void * to, unsigned long from, unsigned long count)
+void _memcpy_fromio(void * to, unsigned long from, size_t count)
 {
 	while (count) {
 		count--;
@@ -20,7 +21,7 @@ void _memcpy_fromio(void * to, unsigned long from, unsigned long count)
  * Copy data from "real" memory space to IO memory space.
  * This needs to be optimized.
  */
-void _memcpy_toio(unsigned long to, const void * from, unsigned long count)
+void _memcpy_toio(unsigned long to, const void * from, size_t count)
 {
 	while (count) {
 		count--;
@@ -34,7 +35,7 @@ void _memcpy_toio(unsigned long to, const void * from, unsigned long count)
  * "memset" on IO memory space.
  * This needs to be optimized.
  */
-void _memset_io(unsigned long dst, int c, unsigned long count)
+void _memset_io(unsigned long dst, int c, size_t count)
 {
 	while (count) {
 		count--;