From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1535C388F7 for ; Tue, 3 Nov 2020 18:12:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 957C320757 for ; Tue, 3 Nov 2020 18:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604427128; bh=QCHSF+94LKGSLQPMW0glad3A+EX+spOHxBoFB0aXvBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ch3rNtQNEd8VGj601EiUVVlRxdJiQ1uX/MWHnkhN8oXDPpBSD5UXMNABEX21Wk0Me Ot0E1FMVVJUhNWmwG3xEGEzezIqUuO0CG6om5vKL3hxIMYBfbsGJlS0zXL85C2SkkT DJe31MIkkrLeVKRhEJ8MY+Ktm3TZFgMxjaHkqqbk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729183AbgKCSMH (ORCPT ); Tue, 3 Nov 2020 13:12:07 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:45025 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729155AbgKCSMG (ORCPT ); Tue, 3 Nov 2020 13:12:06 -0500 Received: by mail-lj1-f194.google.com with SMTP id o13so11773215ljj.11 for ; Tue, 03 Nov 2020 10:12:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DWS2S4IqKiS2heydlDLEdna4ZCr5rpDtwM55ddWvvtU=; b=dE4epqtkukLdnMAeW09E5updd89FsOOWFdGuXHj3d1Rftay+iX9lTmrSyV7oRbjgGK YMKcz4PjKQx26oSBUGOzGl2aXk5fCbM+fn//OHxs5Cuzu2uO0602kV2YaZrIOvm9vTCj JdaI9w15Hl7qvrD21UbtHMEcaz3wYYobYsFXWEQP9IWohZ3bL7z+ku5KmPfdvDItNLq5 CU8Bf4m5Z6YjHnr7aGMf0waqrlQiYbE2+tvx9txaZhuKD6G5dcp5WGWQUJHGmin82Oab aunPTB4K+pDghWgXTPVFfJ+V65xWF2Y9raxGB881H8APlAFoS392eaSqd7EXZBqYcxhh tPKQ== X-Gm-Message-State: AOAM532O0fFdrLAIlu//iiA1a+wBIIk/BTTlAydtSz3RIQXPBGTdaXND d+cUemzq75Cb9bY6KqDFGRA= X-Google-Smtp-Source: ABdhPJwc8wDtdPCNAYPFmWQsDK9gsD0scYRvOTXL6ZCroo6mSIn3e70xQH7uoKlgadVzXtsqqhLFSg== X-Received: by 2002:a05:651c:1245:: with SMTP id h5mr8111765ljh.404.1604427123263; Tue, 03 Nov 2020 10:12:03 -0800 (PST) Received: from xi.terra (c-beaee455.07-184-6d6c6d4.bbcust.telenor.se. [85.228.174.190]) by smtp.gmail.com with ESMTPSA id p21sm3961746lfc.231.2020.11.03.10.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 10:12:01 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.93.0.4) (envelope-from ) id 1ka0mo-0002rk-04; Tue, 03 Nov 2020 19:12:02 +0100 From: Johan Hovold To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Rob Herring , Frank Rowand , Greg Kroah-Hartman , Jessica Yu , Nick Desaulniers , Arnd Bergmann , Geert Uytterhoeven , Dmitry Torokhov , David Miller , Jakub Jelinek , Peter Zijlstra , Thomas Gleixner , Steven Rostedt , Daniel Kurtz , linux-arch@vger.kernel.org, linux-m68k@lists.linux-m68k.org, Johan Hovold Subject: [PATCH 5/8] init: use type alignment for kernel parameters Date: Tue, 3 Nov 2020 18:57:08 +0100 Message-Id: <20201103175711.10731-6-johan@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103175711.10731-1-johan@kernel.org> References: <20201103175711.10731-1-johan@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-m68k@vger.kernel.org Specify type alignment for kernel parameters instead of sizeof(long). The alignment attribute is used to prevent gcc from increasing the alignment of objects with static extent, something which would mess up the __setup array stride. Using __alignof__(struct obs_kernel_param) rather than sizeof(long) is preferred since it better indicates why it is there and doesn't break should the type size or alignment change. Note that on m68k the alignment of struct obs_kernel_param is actually two and that adding a 1- or 2-byte field to the 12-byte struct would cause a breakage with the current 4-byte alignment. Signed-off-by: Johan Hovold --- include/linux/init.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/init.h b/include/linux/init.h index 7b53cb3092ee..e668832ef66a 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -255,7 +255,7 @@ struct obs_kernel_param { __aligned(1) = str; \ static struct obs_kernel_param __setup_##unique_id \ __used __section(".init.setup") \ - __attribute__((aligned((sizeof(long))))) \ + __aligned(__alignof__(struct obs_kernel_param)) \ = { __setup_str_##unique_id, fn, early } #define __setup(str, fn) \ -- 2.26.2