[PATCH] objtool: make orc_types.h headers match

[PATCH] objtool: make orc_types.h headers match

[Arnd Bergmann]

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 <arnd@arndb.de>
---
 tools/objtool/orc_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.9.0

Re: [PATCH] objtool: make orc_types.h headers match

[Josh Poimboeuf]

On Tue, Jul 25, 2017 at 05:28:48PM +0200, Arnd Bergmann wrote:
> 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.

Oops!

> This picks the copy from the x86 headers (without the __packed
> annotation), by roll of dice.

You lost ;-)  It should be __packed.

BTW this will also be fixed when the ORC unwinder gets merged, which
will presumably be soon.

> Fixes: 39358a033b2e ("objtool, x86: Add facility for asm code to provide unwind hints")

^^^ This is the one that introduced the bug.

-- 
Josh