From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@hp.com>
Subject: [PATCH] sys_sendmsg() alignment bug fix
Date: Mon, 26 Sep 2005 14:02:01 -0600
Message-ID: <1127764921.6529.60.camel@tdi>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Return-path: <linux-kernel-owner+glk-linux-kernel-3=40m.gmane.org-S932486AbVIZUDe@vger.kernel.org>
To: akpm@osdl.org
Sender: linux-kernel-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

   The patch below adds an alignment attribute to the buffer used in
sys_sendmsg().  This eliminates an unaligned access warning on ia64.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff -r db9b9552a2b4 net/socket.c
--- a/net/socket.c	Sat Sep 24 23:56:08 2005
+++ b/net/socket.c	Mon Sep 26 13:44:09 2005
@@ -1700,7 +1700,9 @@
 	struct socket *sock;
 	char address[MAX_SOCK_ADDR];
 	struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
-	unsigned char ctl[sizeof(struct cmsghdr) + 20];	/* 20 is size of ipv6_pktinfo */
+	unsigned char ctl[sizeof(struct cmsghdr) + 20]
+	                  __attribute__ ((aligned (sizeof(__kernel_size_t))));
+	                  /* 20 is size of ipv6_pktinfo */
 	unsigned char *ctl_buf = ctl;
 	struct msghdr msg_sys;
 	int err, ctl_len, iov_size, total_len;