From 9f1bfdfbfd043634d05c2d32c19d1a7aa23ac770 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Nov 2021 14:14:16 +0100 Subject: [PATCH] update queue-4.19/xtensa-use-config_use_of-instead-of-config_of.patch --- ...se-config_use_of-instead-of-config_of.patch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/queue-4.19/xtensa-use-config_use_of-instead-of-config_of.patch b/queue-4.19/xtensa-use-config_use_of-instead-of-config_of.patch index 9acae80e07f..6c87cd8d340 100644 --- a/queue-4.19/xtensa-use-config_use_of-instead-of-config_of.patch +++ b/queue-4.19/xtensa-use-config_use_of-instead-of-config_of.patch @@ -42,10 +42,22 @@ Signed-off-by: Randy Dunlap Signed-off-by: Max Filippov Signed-off-by: Greg Kroah-Hartman --- - arch/xtensa/kernel/setup.c | 12 ++++++------ - arch/xtensa/mm/mmu.c | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) + arch/xtensa/include/asm/vectors.h | 2 +- + arch/xtensa/kernel/setup.c | 12 ++++++------ + arch/xtensa/mm/mmu.c | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) +--- a/arch/xtensa/include/asm/vectors.h ++++ b/arch/xtensa/include/asm/vectors.h +@@ -31,7 +31,7 @@ + #endif + #define XCHAL_KIO_SIZE 0x10000000 + +-#if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_OF) ++#if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_USE_OF) + #define XCHAL_KIO_PADDR xtensa_get_kio_paddr() + #ifndef __ASSEMBLY__ + extern unsigned long xtensa_kio_paddr; --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -65,7 +65,7 @@ int initrd_is_mapped = 0; -- 2.47.2