Skip to content

Commit 1d3ffc3

Browse files
committed
CDO: Handle .data..unlikely sections.
Upstream kernel commit [1] renamed .data.unlikely section as .data..unlikely. Handle it the same as .data.unlikely sections. [1] bb43a59944f4 ("Rename .data.unlikely to .data..unlikely") Signed-off-by: Song Liu <song@kernel.org>
1 parent 4f50a19 commit 1d3ffc3

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

kpatch-build/create-diff-object.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,13 +1735,13 @@ static void kpatch_verify_patchability(struct kpatch_elf *kelf)
17351735

17361736
/*
17371737
* ensure we aren't including .data.* or .bss.*
1738-
* (.data.unlikely, .data.once, and .data..once is ok b/c it only
1739-
* has __warned vars)
1738+
* (.data.unlikely, .data..unlikely, .data.once, and .data..once is ok
1739+
* b/c it only has __warned vars)
17401740
*/
17411741
if (sec->include && sec->status != NEW &&
17421742
(!strncmp(sec->name, ".data", 5) || !strncmp(sec->name, ".bss", 4)) &&
1743-
(strcmp(sec->name, ".data.unlikely") && strcmp(sec->name, ".data.once") &&
1744-
strcmp(sec->name, ".data..once"))) {
1743+
(strcmp(sec->name, ".data.unlikely") && strcmp(sec->name, ".data..unlikely") &&
1744+
strcmp(sec->name, ".data.once") && strcmp(sec->name, ".data..once"))) {
17451745
log_normal("data section %s selected for inclusion\n",
17461746
sec->name);
17471747
errs++;

0 commit comments

Comments
 (0)