Skip to content

Commit 52c8322

Browse files
author
CKI KWF Bot
committed
Merge: redhat: automotive: remove tech preview message
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/314 JIRA: https://issues.redhat.com/browse/RHEL-77268 Upstream Status: RHEL only This introduces a Red Hat only config used to define code that differs from RHEL when building the automotive kernel. This new config is then used to remove the tech preview warning message for real-time kernels in the automotive kernel. Depends: !287 Signed-off-by: Scott Weaver <scweaver@redhat.com> Approved-by: Eder Zulian <ezulian@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: Derek Barbosa <debarbos@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 09176fc + a3873ab commit 52c8322

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

Kconfig.redhat

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,12 @@ config RH_KABI_SIZE_ALIGN_CHECKS
2020
be disabled in case of a debug build, because debug builds
2121
allow to change struct sizes.
2222

23+
config RH_AUTOMOTIVE
24+
bool "Enable automotive only code"
25+
depends on RHEL_DIFFERENCES
26+
default n
27+
help
28+
This option controls whether code is included in the automotive
29+
kernel build. If you are building an automotive kernel, say Y.
30+
2331
endmenu

arch/arm64/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
336336

337337
paging_init();
338338

339-
if (IS_ENABLED(CONFIG_PREEMPT_RT))
339+
if (IS_ENABLED(CONFIG_PREEMPT_RT) && !IS_ENABLED(CONFIG_RH_AUTOMOTIVE))
340340
mark_tech_preview("RHEL-RT on ARM64", NULL);
341341

342342
acpi_table_upgrade();
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CONFIG_RH_AUTOMOTIVE=y
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# CONFIG_RH_AUTOMOTIVE is not set

0 commit comments

Comments
 (0)