From patchwork Tue Feb 1 05:11:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 81270 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 547DCB70EE for ; Tue, 1 Feb 2011 16:10:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750849Ab1BAFKm (ORCPT ); Tue, 1 Feb 2011 00:10:42 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:44232 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750828Ab1BAFKm (ORCPT ); Tue, 1 Feb 2011 00:10:42 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 2D85524C087; Mon, 31 Jan 2011 21:11:17 -0800 (PST) Date: Mon, 31 Jan 2011 21:11:16 -0800 (PST) Message-Id: <20110131.211116.115946085.davem@davemloft.net> To: jesper.nilsson@axis.com Cc: richm@oldelvet.org.uk, 609371@bugs.debian.org, ben@decadent.org.uk, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com, jeffm@suse.com Subject: Re: Bug#609371: linux-image-2.6.37-trunk-sparc64: module scsi_mod: Unknown relocation: 36 From: David Miller In-Reply-To: <20110117090557.GF9874@axis.com> References: <20110115.211722.39173519.davem@davemloft.net> <20110116.220755.179947617.davem@davemloft.net> <20110117090557.GF9874@axis.com> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Jesper Nilsson Date: Mon, 17 Jan 2011 10:05:57 +0100 > On Mon, Jan 17, 2011 at 07:07:55AM +0100, David Miller wrote: >> Ugh, and I just noticed that include/linux/klist.h does this fixed >> alignment of "4" too, where is this stuff coming from? It's >> wrong on 64-bit, at best. But I can't see the impetus behind doing >> this at all in the first place. >> >> Oh, this is some CRIS thing, because it only byte aligns. See: >> >> commit c0e69a5bbc6fc74184aa043aadb9a53bc58f953b >> Author: Jesper Nilsson >> Date: Wed Jan 14 11:19:08 2009 +0100 >> >> klist.c: bit 0 in pointer can't be used as flag >> >> That's where the klist one comes from. > > Yup, this one could instead be solved by introducing a "flags" field > in the struct, but that was considered a too large impact fix. Jesper, could you please review this? -------------------- klist: Fix object alignment on 64-bit. Commit c0e69a5bbc6fc74184aa043aadb9a53bc58f953b ("klist.c: bit 0 in pointer can't be used as flag") intended to make sure that all klist objects were at least pointer size aligned, but used the constant "4" which only works on 32-bit. Use "sizeof(void *)" which is correct in all cases. Signed-off-by: David S. Miller Acked-by: Jesper Nilsson --- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/klist.h b/include/linux/klist.h index e91a4e5..a370ce5 100644 --- a/include/linux/klist.h +++ b/include/linux/klist.h @@ -22,7 +22,7 @@ struct klist { struct list_head k_list; void (*get)(struct klist_node *); void (*put)(struct klist_node *); -} __attribute__ ((aligned (4))); +} __attribute__ ((aligned (sizeof(void *)))); #define KLIST_INIT(_name, _get, _put) \ { .k_lock = __SPIN_LOCK_UNLOCKED(_name.k_lock), \