Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

8 files changed, 21 insertions, 21 deletions

diff --git a/include/asm-sparc/checksum.h b/include/asm-sparc/checksum.h
index 5a03aab1dd18..286158108974 100644
--- a/include/asm-sparc/checksum.h
+++ b/include/asm-sparc/checksum.h
@@ -61,7 +61,7 @@ csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst, int len
 }
 
 static inline unsigned int 
-csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int len,
+csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst, int len,
 			    unsigned int sum, int *err)
   {
 	if (!access_ok (VERIFY_READ, src, len)) {
@@ -69,7 +69,7 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int le
 		memset (dst, 0, len);
 		return sum;
 	} else {
-		register unsigned int ret asm("o0") = (unsigned int)src;
+		register unsigned long ret asm("o0") = (unsigned long)src;
 		register char *d asm("o1") = dst;
 		register int l asm("g1") = len;
 		register unsigned int s asm("g7") = sum;
@@ -98,8 +98,8 @@ csum_partial_copy_to_user(const unsigned char *src, unsigned char __user *dst, i
 		*err = -EFAULT;
 		return sum;
 	} else {
-		register unsigned int ret asm("o0") = (unsigned int)src;
-		register char *d asm("o1") = dst;
+		register unsigned long ret asm("o0") = (unsigned long)src;
+		register char __user *d asm("o1") = dst;
 		register int l asm("g1") = len;
 		register unsigned int s asm("g7") = sum;
 
diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h
index d17864207d07..4a71d7c1eace 100644
--- a/include/asm-sparc/elf.h
+++ b/include/asm-sparc/elf.h
@@ -88,11 +88,11 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 #define ELF_CORE_COPY_REGS(__elf_regs, __pt_regs)	\
 do {	unsigned long *dest = &(__elf_regs[0]);		\
 	struct pt_regs *src = (__pt_regs);		\
-	unsigned long *sp;				\
+	unsigned long __user *sp;			\
 	memcpy(&dest[0], &src->u_regs[0],		\
 	       sizeof(unsigned long) * 16);		\
 	/* Don't try this at home kids... */		\
-	sp = (unsigned long *) src->u_regs[14];		\
+	sp = (unsigned long __user *) src->u_regs[14];	\
 	copy_from_user(&dest[16], sp,			\
 		       sizeof(unsigned long) * 16);	\
 	dest[32] = src->psr;				\
diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h
index 5154947c70ef..4507834def1d 100644
--- a/include/asm-sparc/floppy.h
+++ b/include/asm-sparc/floppy.h
@@ -213,7 +213,7 @@ unsigned long pdma_size;
 volatile int doing_pdma = 0;
 
 /* This is software state */
-char *pdma_base = 0;
+char *pdma_base = NULL;
 unsigned long pdma_areasize;
 
 /* Common routines to all controller types on the Sparc. */
diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h
index 3f8b9924a9b6..f98570f54b53 100644
--- a/include/asm-sparc/io.h
+++ b/include/asm-sparc/io.h
@@ -134,12 +134,12 @@ static inline void __writel(u32 l, volatile void __iomem *addr)
 #define inl_p(__addr)		inl(__addr)
 #define outl_p(__l, __addr)	outl(__l, __addr)
 
-void outsb(void * __iomem addr, const void *src, unsigned long cnt);
-void outsw(void * __iomem addr, const void *src, unsigned long cnt);
-void outsl(void * __iomem addr, const void *src, unsigned long cnt);
-void insb(void * __iomem addr, void *dst, unsigned long count);
-void insw(void * __iomem addr, void *dst, unsigned long count);
-void insl(void * __iomem addr, void *dst, unsigned long count);
+void outsb(unsigned long addr, const void *src, unsigned long cnt);
+void outsw(unsigned long addr, const void *src, unsigned long cnt);
+void outsl(unsigned long addr, const void *src, unsigned long cnt);
+void insb(unsigned long addr, void *dst, unsigned long count);
+void insw(unsigned long addr, void *dst, unsigned long count);
+void insl(unsigned long addr, void *dst, unsigned long count);
 
 #define IO_SPACE_LIMIT 0xffffffff
 
diff --git a/include/asm-sparc/svr4.h b/include/asm-sparc/svr4.h
index 331157291e07..da1f1c980e2d 100644
--- a/include/asm-sparc/svr4.h
+++ b/include/asm-sparc/svr4.h
@@ -49,7 +49,7 @@ typedef struct {
 
 typedef struct {
 	int            count;
-	int            *winptr [SVR4_MAXWIN]; /* pointer to the windows */
+	int            __user *winptr [SVR4_MAXWIN]; /* pointer to the windows */
 	svr4_rwindow_t win[SVR4_MAXWIN];      /* the windows */
 } svr4_gwindows_t;
 
@@ -72,7 +72,7 @@ typedef struct {
 /* Machine dependent context */
 typedef struct {
 	svr4_gregset_t   greg;	/* registers 0..19 (see top) */
-	svr4_gwindows_t  *gwin;	/* may point to register windows */
+	svr4_gwindows_t  __user *gwin;	/* may point to register windows */
 	svr4_fregset_t   freg;	/* floating point registers */
 	svr4_xrs_t       xrs;	/* mhm? */
 	long             pad[19];
@@ -86,7 +86,7 @@ enum svr4_stack_flags {
 
 /* signal stack exection place, unsupported */
 typedef struct svr4_stack_t {
-        char *sp;
+        char __user *sp;
         int  size;
         int  flags;
 } svr4_stack_t;
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h
index 4fb0ac34c069..a8e77ad1ea46 100644
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
@@ -200,7 +200,7 @@ static inline unsigned long getipl(void)
 #define smp_wmb()	__asm__ __volatile__("":::"memory")
 #define smp_read_barrier_depends()	do { } while(0)
 
-#define nop() __asm__ __volatile__ ("nop");
+#define nop() __asm__ __volatile__ ("nop")
 
 /* This has special calling conventions */
 #ifndef CONFIG_SMP
diff --git a/include/asm-sparc64/fbio.h b/include/asm-sparc64/fbio.h
index c6c4da6e139d..500026d9f6e1 100644
--- a/include/asm-sparc64/fbio.h
+++ b/include/asm-sparc64/fbio.h
@@ -102,8 +102,8 @@ struct fbcursor {
         struct fbcurpos hot;    /* cursor hot spot */
         struct fbcmap cmap;     /* color map info */
         struct fbcurpos size;   /* cursor bit map size */
-        char *image;            /* cursor image bits */
-        char *mask;             /* cursor mask bits */
+        char __user *image;     /* cursor image bits */
+        char __user *mask;      /* cursor mask bits */
 };
 
 /* set/get cursor attributes/shape */
diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h
index 30276548912f..6661a23b6883 100644
--- a/include/asm-sparc64/io.h
+++ b/include/asm-sparc64/io.h
@@ -417,13 +417,13 @@ _memcpy_toio(volatile void __iomem *dst, const void *src, __kernel_size_t n)
 
 #define memcpy_toio(d,s,sz)	_memcpy_toio(d,s,sz)
 
-static inline int check_signature(unsigned long io_addr,
+static inline int check_signature(void __iomem *io_addr,
 				  const unsigned char *signature,
 				  int length)
 {
 	int retval = 0;
 	do {
-		if (readb((void __iomem *)io_addr) != *signature++)
+		if (readb(io_addr) != *signature++)
 			goto out;
 		io_addr++;
 	} while (--length);