| From e7e83dd3ff1dd2f9e60213f6eedc7e5b08192062 Mon Sep 17 00:00:00 2001 |
| From: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| Date: Tue, 26 Dec 2017 15:27:20 -0600 |
| Subject: objtool: Fix Clang enum conversion warning |
| |
| From: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| |
| commit e7e83dd3ff1dd2f9e60213f6eedc7e5b08192062 upstream. |
| |
| Fix the following Clang enum conversion warning: |
| |
| arch/x86/decode.c:141:20: error: implicit conversion from enumeration |
| type 'enum op_src_type' to different enumeration |
| type 'enum op_dest_type' [-Werror,-Wenum-conversion] |
| |
| op->dest.type = OP_SRC_REG; |
| ~ ^~~~~~~~~~ |
| |
| It just happened to work before because OP_SRC_REG and OP_DEST_REG have |
| the same value. |
| |
| Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> |
| Reviewed-by: Nicholas Mc Guire <der.herr@hofr.at> |
| Reviewed-by: Nick Desaulniers <nick.desaulniers@gmail.com> |
| Cc: Jiri Slaby <jslaby@suse.cz> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Fixes: baa41469a7b9 ("objtool: Implement stack validation 2.0") |
| Link: http://lkml.kernel.org/r/b4156c5738bae781c392e7a3691aed4514ebbdf2.1514323568.git.jpoimboe@redhat.com |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Cc: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/objtool/arch/x86/decode.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/tools/objtool/arch/x86/decode.c |
| +++ b/tools/objtool/arch/x86/decode.c |
| @@ -138,7 +138,7 @@ int arch_decode_instruction(struct elf * |
| *type = INSN_STACK; |
| op->src.type = OP_SRC_ADD; |
| op->src.reg = op_to_cfi_reg[modrm_reg][rex_r]; |
| - op->dest.type = OP_SRC_REG; |
| + op->dest.type = OP_DEST_REG; |
| op->dest.reg = CFI_SP; |
| } |
| break; |