From 02010ee6d035052ba43e9ab7aa6d175fa9a5faf0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 5 Aug 2020 21:58:56 +0200 Subject: [PATCH] 5.7-stable patches added patches: random-random.h-should-include-archrandom.h-not-the-other-way-around.patch --- ...rchrandom.h-not-the-other-way-around.patch | 49 +++++++++++++++++++ queue-5.7/series | 1 + 2 files changed, 50 insertions(+) create mode 100644 queue-5.7/random-random.h-should-include-archrandom.h-not-the-other-way-around.patch diff --git a/queue-5.7/random-random.h-should-include-archrandom.h-not-the-other-way-around.patch b/queue-5.7/random-random.h-should-include-archrandom.h-not-the-other-way-around.patch new file mode 100644 index 00000000000..b3d508cfc18 --- /dev/null +++ b/queue-5.7/random-random.h-should-include-archrandom.h-not-the-other-way-around.patch @@ -0,0 +1,49 @@ +From 585524081ecdcde1c719e63916c514866d898217 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Wed, 5 Aug 2020 12:39:48 -0700 +Subject: random: random.h should include archrandom.h, not the other way around +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Linus Torvalds + +commit 585524081ecdcde1c719e63916c514866d898217 upstream. + +This is hopefully the final piece of the crazy puzzle with random.h +dependencies. + +And by "hopefully" I obviously mean "Linus is a hopeless optimist". + +Reported-and-tested-by: Daniel Díaz +Acked-by: Guenter Roeck +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/include/asm/archrandom.h | 1 - + arch/arm64/kernel/kaslr.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +--- a/arch/arm64/include/asm/archrandom.h ++++ b/arch/arm64/include/asm/archrandom.h +@@ -6,7 +6,6 @@ + + #include + #include +-#include + #include + + static inline bool __arm64_rndr(unsigned long *v) +--- a/arch/arm64/kernel/kaslr.c ++++ b/arch/arm64/kernel/kaslr.c +@@ -10,8 +10,8 @@ + #include + #include + #include ++#include + +-#include + #include + #include + #include diff --git a/queue-5.7/series b/queue-5.7/series index c8e9801b9f2..6d127319109 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -4,3 +4,4 @@ random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch random32-move-the-pseudo-random-32-bit-definitions-to-prandom.h.patch arm64-workaround-circular-dependency-in-pointer_auth.h.patch +random-random.h-should-include-archrandom.h-not-the-other-way-around.patch -- 2.47.3