Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Tobias Klauser <tklauser@distanz.ch>,
        Vincent Cuissard <cuissard@marvell.com>,
        Samuel Ortiz <sameo@linux.intel.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 093/219] NFC: nfcmrvl: Include unaligned.h
 instead of access_ok.h
Thread-Topic: [PATCH AUTOSEL for 4.9 093/219] NFC: nfcmrvl: Include
 unaligned.h instead of access_ok.h
Thread-Index: AQHTsz8A4rR6qPwT9E6hfVCDYXsYhA==
Date:   Sat, 3 Mar 2018 22:28:49 +0000
Message-ID: <20180303222716.26640-93-alexander.levin@microsoft.com>
References: <20180303222716.26640-1-alexander.levin@microsoft.com>
In-Reply-To: <20180303222716.26640-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 9dd0cfc9-9dee-45be-3bf9-08d58156d6ff
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:28:49.7444
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1065
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Tobias Klauser <tklauser@distanz.ch>

[ Upstream commit d916d923724d59cde99ee588f15eec59dd863bbd ]

Including linux/unaligned/access_ok.h causes the allmodconfig build on
ia64 (and maybe others) to fail with the following warnings:

include/linux/unaligned/access_ok.h:7:19: error: redefinition of 'get_unali=
gned_le16'
include/linux/unaligned/access_ok.h:12:19: error: redefinition of 'get_unal=
igned_le32'
include/linux/unaligned/access_ok.h:17:19: error: redefinition of 'get_unal=
igned_le64'
include/linux/unaligned/access_ok.h:22:19: error: redefinition of 'get_unal=
igned_be16'
include/linux/unaligned/access_ok.h:27:19: error: redefinition of 'get_unal=
igned_be32'
include/linux/unaligned/access_ok.h:32:19: error: redefinition of 'get_unal=
igned_be64'
include/linux/unaligned/access_ok.h:37:20: error: redefinition of 'put_unal=
igned_le16'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unal=
igned_le32'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unal=
igned_le64'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unal=
igned_be16'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unal=
igned_be32'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unal=
igned_be64'

Fix these by including asm/unaligned.h instead and leave it up to the
architecture to decide how to implement unaligned accesses.

Fixes: 3194c6870158 ("NFC: nfcmrvl: add firmware download support")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Link: https://lkml.org/lkml/2016/10/22/247
Cc: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/nfc/nfcmrvl/fw_dnld.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c
index af62c4c854f3..b4f31dad40d6 100644
--- a/drivers/nfc/nfcmrvl/fw_dnld.c
+++ b/drivers/nfc/nfcmrvl/fw_dnld.c
@@ -17,7 +17,7 @@
  */
=20
 #include <linux/module.h>
-#include <linux/unaligned/access_ok.h>
+#include <asm/unaligned.h>
 #include <linux/firmware.h>
 #include <linux/nfc.h>
 #include <net/nfc/nci.h>
--=20
2.14.1