Skip to content

Commit 608443b

Browse files
committed
Merge: main.c: fix initcall blacklisted
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6584 JIRA: https://issues.redhat.com/browse/RHEL-83272 Upstream Status: RHEL only Ensure that init_rh_check_status gets called by removing the blacklisted optimization in our kernels. Signed-off-by: Tomas Henzl <thenzl@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents 74782eb + 69ed2b8 commit 608443b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

init/main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,8 +1142,10 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
11421142
char fn_name[KSYM_SYMBOL_LEN];
11431143
unsigned long addr;
11441144

1145+
#ifndef CONFIG_RHEL_DIFFERENCES
11451146
if (list_empty(&blacklisted_initcalls))
11461147
return false;
1148+
#endif
11471149

11481150
addr = (unsigned long) dereference_function_descriptor(fn);
11491151
sprint_symbol_no_offset(fn_name, addr);

0 commit comments

Comments
 (0)