Skip to content

Commit 457f4d0

Browse files
author
CKI KWF Bot
committed
Merge: KASLR: proactive backports to v6.14
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7370 JIRA: https://issues.redhat.com/browse/RHEL-110658 Backport of selected KASLR-related fixes, cleanups, and enhancements targeting upstream v6.14. Signed-off-by: Ricardo Robaina <rrobaina@redhat.com> Approved-by: Audra Mitchell <aubaker@redhat.com> Approved-by: Prarit Bhargava <prarit@redhat.com> Approved-by: Rafael Aquini <raquini@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 1295404 + 9440d3e commit 457f4d0

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

arch/x86/boot/compressed/kaslr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
#include "efi.h"
2626

2727
#include <generated/compile.h>
28-
#include <linux/module.h>
29-
#include <linux/uts.h>
30-
#include <linux/utsname.h>
31-
#include <linux/ctype.h>
3228
#include <generated/utsrelease.h>
3329

3430
#define _SETUP

arch/x86/mm/kaslr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <linux/kernel.h>
2424
#include <linux/init.h>
25-
#include <linux/random.h>
25+
#include <linux/prandom.h>
2626
#include <linux/memblock.h>
2727
#include <linux/pgtable.h>
2828

0 commit comments

Comments
 (0)