diff options
Diffstat (limited to 'features/rt/powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch')
| -rw-r--r-- | features/rt/powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/features/rt/powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch b/features/rt/powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch new file mode 100644 index 00000000..9f28057d --- /dev/null +++ b/features/rt/powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch @@ -0,0 +1,43 @@ +From 36035164cb4bbf6cc044ff5d6f481c528ec34fb3 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Fri, 19 Feb 2021 17:51:07 +0100 +Subject: [PATCH 006/191] powerpc/mm: Move the linear_mapping_mutex to the + ifdef where it is used + +The mutex linear_mapping_mutex is defined at the of the file while its +only two user are within the CONFIG_MEMORY_HOTPLUG block. +A compile without CONFIG_MEMORY_HOTPLUG set fails on PREEMPT_RT because +its mutex implementation is smart enough to realize that it is unused. + +Move the definition of linear_mapping_mutex to ifdef block where it is +used. + +Fixes: 1f73ad3e8d755 ("powerpc/mm: print warning in arch_remove_linear_mapping()") +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + arch/powerpc/mm/mem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c +index 4e8ce6d85232..7a59a5c9aa5d 100644 +--- a/arch/powerpc/mm/mem.c ++++ b/arch/powerpc/mm/mem.c +@@ -54,7 +54,6 @@ + + #include <mm/mmu_decl.h> + +-static DEFINE_MUTEX(linear_mapping_mutex); + unsigned long long memory_limit; + bool init_mem_is_free; + +@@ -72,6 +71,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, + EXPORT_SYMBOL(phys_mem_access_prot); + + #ifdef CONFIG_MEMORY_HOTPLUG ++static DEFINE_MUTEX(linear_mapping_mutex); + + #ifdef CONFIG_NUMA + int memory_add_physaddr_to_nid(u64 start) +-- +2.19.1 + |