提交 c0662e13 编写于 作者: L Linus Torvalds 提交者: Yang Yingliang

random: random.h should include archrandom.h, not the other way around

mainline inclusion
from mainline-v5.8
commit 58552408
category:bugfix
bugzilla:NA
CVE:NA

-------------------

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: NDaniel Díaz <daniel.diaz@linaro.org>
Acked-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

 Conflicts:
	arch/arm64/kernel/kaslr.c
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 e30b5232
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/random.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
static inline bool __arm64_rndr(unsigned long *v) static inline bool __arm64_rndr(unsigned long *v)
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/mm_types.h> #include <linux/mm_types.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/random.h>
#include <asm/archrandom.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/fixmap.h> #include <asm/fixmap.h>
#include <asm/kernel-pgtable.h> #include <asm/kernel-pgtable.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册