diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-22 06:23:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-22 06:23:48 +0200 |
commit | 15a5c1947ba5e434aa4794dedb5993f960275177 (patch) | |
tree | 881f297746a797af91ab542d66c9aab84e712e48 /patch-5.13.0-redhat.patch | |
parent | 31c3bf0db77127c3b75cc183596ea2a838319e8f (diff) | |
parent | 80fa87205c87b1e049f9b5713358f486474eec98 (diff) | |
download | kernel-15a5c1947ba5e434aa4794dedb5993f960275177.tar.gz kernel-15a5c1947ba5e434aa4794dedb5993f960275177.tar.xz kernel-15a5c1947ba5e434aa4794dedb5993f960275177.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc35kernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc34kernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc33kernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc32
Diffstat (limited to 'patch-5.13.0-redhat.patch')
-rw-r--r-- | patch-5.13.0-redhat.patch | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index e0e027477..bb621aef6 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -60,13 +60,14 @@ kernel/module_signing.c | 9 +- kernel/panic.c | 14 + kernel/rh_taint.c | 93 +++++++ + mm/cma.c | 10 + scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 68 files changed, 1197 insertions(+), 187 deletions(-) + 69 files changed, 1207 insertions(+), 187 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -2610,6 +2611,34 @@ index 000000000000..4050b6dead75 + name ? name : "kernel"); +} +EXPORT_SYMBOL(mark_driver_unsupported); +diff --git a/mm/cma.c b/mm/cma.c +index 995e15480937..588f7e7885cf 100644 +--- a/mm/cma.c ++++ b/mm/cma.c +@@ -125,6 +125,12 @@ static void __init cma_activate_area(struct cma *cma) + spin_lock_init(&cma->mem_head_lock); + #endif + ++#ifdef CONFIG_RHEL_DIFFERENCES ++ /* s390x and ppc64 has been using CMA already in RHEL 8 as default. */ ++ if (!IS_ENABLED(CONFIG_S390) && !IS_ENABLED(CONFIG_PPC64)) ++ mark_tech_preview("CMA", NULL); ++#endif /* CONFIG_RHEL_DIFFERENCES */ ++ + return; + + not_in_zone: +@@ -437,6 +443,10 @@ struct page *cma_alloc(struct cma *cma, unsigned long count, + if (!cma || !cma->count || !cma->bitmap) + goto out; + ++#ifdef CONFIG_RHEL_DIFFERENCES ++ pr_info_once("Initial CMA usage detected\n"); ++#endif /* CONFIG_RHEL_DIFFERENCES */ ++ + pr_debug("%s(cma %p, count %lu, align %d)\n", __func__, (void *)cma, + count, align); + diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 3e623ccc020b..3047abc9a507 100644 --- a/scripts/mod/modpost.c |