diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-06 15:51:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-06 15:51:56 +0200 |
| commit | 02678a582392111928650f116b34091bfdb6441e (patch) | |
| tree | b4a8d6ad38f7c405a362f597ff04871bfe20a81b /tools | |
| parent | bce6824cc8e86619901265b7e77c59cc9d99e05b (diff) | |
| parent | 77ac1c02d9f20a0d72fa992c88b98c15d087dbca (diff) | |
Merge branch 'core/core' into x86/build, to prevent conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/objtool/special.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/objtool/special.c b/tools/objtool/special.c index 84f001d52322..50af4e1274b3 100644 --- a/tools/objtool/special.c +++ b/tools/objtool/special.c @@ -30,9 +30,9 @@ #define EX_ORIG_OFFSET 0 #define EX_NEW_OFFSET 4 -#define JUMP_ENTRY_SIZE 24 +#define JUMP_ENTRY_SIZE 16 #define JUMP_ORIG_OFFSET 0 -#define JUMP_NEW_OFFSET 8 +#define JUMP_NEW_OFFSET 4 #define ALT_ENTRY_SIZE 13 #define ALT_ORIG_OFFSET 0 |