diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 08:58:33 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 08:58:33 +0300 |
| commit | ff1c0c5d07028a84837950b619d30da623f8ddb2 (patch) | |
| tree | 0dac4e0728613580a935876b3b5ba7ba29f51865 /tools/objtool/klp-diff.c | |
| parent | 09c04714cb455debc1dcc3535b6becb52c5b01e0 (diff) | |
| parent | d6e152d905bdb1f32f9d99775e2f453350399a6a (diff) | |
| download | linux-ff1c0c5d07028a84837950b619d30da623f8ddb2.tar.xz | |
Merge branch 'timers/urgent' into timers/core
to resolve the conflict with urgent fixes.
Diffstat (limited to 'tools/objtool/klp-diff.c')
| -rw-r--r-- | tools/objtool/klp-diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index a3198a63c2f0..c2c4e4968bc2 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -14,6 +14,7 @@ #include <objtool/util.h> #include <arch/special.h> +#include <linux/align.h> #include <linux/objtool_types.h> #include <linux/livepatch_external.h> #include <linux/stringify.h> @@ -560,7 +561,7 @@ static struct symbol *__clone_symbol(struct elf *elf, struct symbol *patched_sym } if (!is_sec_sym(patched_sym)) - offset = sec_size(out_sec); + offset = ALIGN(sec_size(out_sec), out_sec->sh.sh_addralign); if (patched_sym->len || is_sec_sym(patched_sym)) { void *data = NULL; |