Merge toomuch-wiznet:/md0/net-2.5 into bob.home.kvack.org:/bcrl/net-2.5

net/socket.c

@@ -92,7 +92,7 @@
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
 static ssize_t sock_aio_read(struct kiocb *iocb, char *buf,
 			 size_t size, loff_t pos);
-static ssize_t sock_aio_write(struct kiocb *iocb, char *buf,
+static ssize_t sock_aio_write(struct kiocb *iocb, const char *buf,
 			  size_t size, loff_t pos);
 static int sock_mmap(struct file *file, struct vm_area_struct * vma);
 
@@ -619,7 +619,7 @@ static ssize_t sock_aio_read(struct kiocb *iocb, char *ubuf,
  *	is readable by the user process.
  */
 
-static ssize_t sock_aio_write(struct kiocb *iocb, char *ubuf,
+static ssize_t sock_aio_write(struct kiocb *iocb, const char *ubuf,
 			  size_t size, loff_t pos)
 {
 	struct sock_iocb *x = kiocb_to_siocb(iocb);