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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 4F676C433DF for ; Fri, 5 Jun 2020 14:15:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E1B620878 for ; Fri, 5 Jun 2020 14:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591366554; bh=nZhiGEfILEKMt44G8xrubVFUgbwYyN4KAnoxAwiFdG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o2VGKCsFrBT/r5ML4AN3mcg2me/lT8GfTlxdvPTPN5nX7y+uCotFb0+XlrsW2YJtd 2VcGVijo7a6PyTR1g8Ws1Ak7iyotikvY4vxGXRn9QlYH+VJSfLg6U/GYDbbfbMniX8 0OTHTa9fpExkgPNq1SxBp8iLs10fCu7lZCzzrgis= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728076AbgFEOPx (ORCPT ); Fri, 5 Jun 2020 10:15:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:44588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726553AbgFEOPv (ORCPT ); Fri, 5 Jun 2020 10:15:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BDA302063A; Fri, 5 Jun 2020 14:15:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591366551; bh=nZhiGEfILEKMt44G8xrubVFUgbwYyN4KAnoxAwiFdG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KZC1ucohzrIvk7vnuOMq7wxk/KZt4vXQO7/XwDSFqrRP2HCMckOpqQNIafeKdlx0V w/JpAORlqeYpK3Q2bw1lOMPRALEgvIh1pSYV1BzSPeo0G6sucnY/KDZi8VViij3asV b9ZzOc1h7Eqsell2UeWposx/5k5tnUf8jnmwpQek= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomasz Figa , Bingbu Cao , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 5.7 12/14] media: staging: ipu3-imgu: Move alignment attribute to field Date: Fri, 5 Jun 2020 16:15:02 +0200 Message-Id: <20200605135951.740540761@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200605135951.018731965@linuxfoundation.org> References: <20200605135951.018731965@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sakari Ailus commit 8c038effd893920facedf18c2c0976cec4a33408 upstream. Move the alignment attribute of struct ipu3_uapi_awb_fr_config_s to the field in struct ipu3_uapi_4a_config, the other location where the struct is used. Fixes: commit c9d52c114a9f ("media: staging: imgu: Address a compiler warning on alignment") Reported-by: Tomasz Figa Tested-by: Bingbu Cao Cc: stable@vger.kernel.org # for v5.3 and up Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/ipu3/include/intel-ipu3.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/staging/media/ipu3/include/intel-ipu3.h +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h @@ -450,7 +450,7 @@ struct ipu3_uapi_awb_fr_config_s { __u32 bayer_sign; __u8 bayer_nf; __u8 reserved2[7]; -} __attribute__((aligned(32))) __packed; +} __packed; /** * struct ipu3_uapi_4a_config - 4A config @@ -466,7 +466,8 @@ struct ipu3_uapi_4a_config { struct ipu3_uapi_ae_grid_config ae_grd_config; __u8 padding[20]; struct ipu3_uapi_af_config_s af_config; - struct ipu3_uapi_awb_fr_config_s awb_fr_config; + struct ipu3_uapi_awb_fr_config_s awb_fr_config + __attribute__((aligned(32))); } __packed; /**