From patchwork Tue Jul 25 15:28:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108651 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp700412qge; Tue, 25 Jul 2017 08:29:14 -0700 (PDT) X-Received: by 10.99.43.87 with SMTP id r84mr19509028pgr.314.1500996554495; Tue, 25 Jul 2017 08:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500996554; cv=none; d=google.com; s=arc-20160816; b=F3qDuKqjvhTjRJw/wINxS7uGAClutNfBQ50QScjboYB2X2o8PffJNTi8OyFm2oxAVG Z0LrbsmDIXG02AeXdBGqh+mmVDI1owhZgwNMFTmpkqlrmymTODU8ygAMToY9Kot+mJak +eVDychUvlKX2iulZF982C1T8Ju4yFeMZLePtNauB4xCJwZF499RXd8LWpQfr/uKuT0S LHdEvNcvH74hb5noWdzNmQMtDv0WGRxEcIr5V9XnHhgLh7b180YOaSTnyCLyVrLItAFV b47KPfiGdu21ukiU5wUq7OG0vSaCpCU8MPUMSZHGS5sS3BFucQT8dQ4mHgqLr9PoDhhe h40w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=6Pms9iiRVD2wAdsoE7ui/bBlQHk0/3AUYg6+inHbFMk=; b=ckNoxfdRyTCDo64ejhjR2htZsHJV17fnM991gnfp3QKGgIkF8TMw6F+bLNas348WEX ZN+8qqQWLDp9P05/9qVM1Z26R+YR2xAs7tnpk5hf++JNzV1G8VKf5mBcYpxLvt1ebWjg MDMf6paJmcPM2LwsX8W8AQ31SOLytX3PF0aLwIby/DjWw6OknYwaqBkoWf+ccmVpJ7Hc 6vT/iITIvrNpaXT933lF70TlPUo2r3cn+Cgkb5VGSbHy8xi+hiVHrfJO9qfdzBnMiic3 g7YHhiowDDGGkogFk93Rqve/meejk1h3YNKF2+I3E6htpAncUwN6qMmqzfKS4tKg5Kf+ H6Yg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l24si8097638pgu.76.2017.07.25.08.29.13; Tue, 25 Jul 2017 08:29:14 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752686AbdGYP3L (ORCPT + 26 others); Tue, 25 Jul 2017 11:29:11 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:58040 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539AbdGYP3H (ORCPT ); Tue, 25 Jul 2017 11:29:07 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MeOaJ-1dEGJg1BLb-00QFJ5; Tue, 25 Jul 2017 17:28:59 +0200 From: Arnd Bergmann To: Josh Poimboeuf Cc: Arnd Bergmann , Ingo Molnar , linux-kernel@vger.kernel.org Subject: [PATCH] objtool: make orc_types.h headers match Date: Tue, 25 Jul 2017 17:28:48 +0200 Message-Id: <20170725152858.21264-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:e1IdBPNBfOwB5qFoWPnSLTjy++aygGwNeS/nsrotCkoHIyZX2hP W2FltfzFLFSU3yWB0C0qxIcLkimSUgqq+C0gqIC3fDfG6OIuH0FyiaRBud2jzWxviO4Ubms hRET2AViDMeNCxG6j5SCDL4VlaR3+KR1LgbpRdq0zPzV9w4Fid0zOzDb67AQ3atRYnAylTQ MkF5/ERETjjqJCseVG1fA== X-UI-Out-Filterresults: notjunk:1; V01:K0:BVLD0tgUa1Q=:GdjIuDLywAW2P5iJ3dwU+b ZbTFwxWFCl1GLsKpvZiV5Ujk4PnwzFd+nVM4DG/ETBS1N29djC++7veLBauET2zrR0KAE/6UA pJhadA3ydvV7eZAUgEyepwABKKYUaqin6T+qbodpVu8sdWEcexp7lHW8jQvxd52oYsF6Cy68S mN8QXPswAaxl4vOeneONmDuA9RD0bW06wGLyHWR0eIthg+bYP7bdbzWcyEYgVo9w+zBQSiJFV UnGOYKl8Q+d0/rfWKqmgDlxqbttCoxdMnh+pqo9z9uJylGO/C49chnTvb4kkUNPs0ixTo9QBU PGKDSdfrixzwca1feB5FEgtwJWZSwf6iFwxtSKaDuJjIN6fk/R+z55xcHWNakhIFSD5f6TwQH elTII53K4QDoymZ58z02sUDd64lILWyN91dGhBY+zjPXatC2Szgs3lfJxRKBiIqyQ1OSqADnV bbc5FEiwEn9Rm7qXUWUFXFfB2XVh+XsPwoHoLVUulLV6FWI3TreeqE5XDg7yLE6wXHF38uWDd n1YaIfSkfXhWxlz/7/auKmKQKBgMjnNnp43nxvv4y8hEelbxpGix7UYI9PHXUbskVv/tVUadt VCV+Sr7DYsXRspPTYiwniZnYTQkirIFetie0SMI3DwjWq1hvNphaLHW0wMn/2zXKV3cHhBayx 0csNnAnyRLrxLg7HU+TCPxfTuEvRh6LxkmjnPa7RHWkSc2mNNcSeaPswP91WjWVQvW4d0EHYP +fCqIFtQDplI0Nw0t3u5kv+weM2iqom/rNLFJQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building objtool causes a warning on the latest linux-next kernels: warning: objtool: orc_types.h differs from kernel >From what I can tell, we have two slightly different copies of the same header, and we try to ensure they are the same with the warning. This picks the copy from the x86 headers (without the __packed annotation), by roll of dice. Fixes: 39358a033b2e ("objtool, x86: Add facility for asm code to provide unwind hints") Fixes: 627fce14809b ("objtool: Add ORC unwind table generation") Signed-off-by: Arnd Bergmann --- tools/objtool/orc_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/tools/objtool/orc_types.h b/tools/objtool/orc_types.h index 9c9dc579bd7d..7dc777a6cb40 100644 --- a/tools/objtool/orc_types.h +++ b/tools/objtool/orc_types.h @@ -88,7 +88,7 @@ struct orc_entry { unsigned sp_reg:4; unsigned bp_reg:4; unsigned type:2; -} __packed; +}; /* * This struct is used by asm and inline asm code to manually annotate the