From b306a14ab81a53f568663c93f8d4cc22996f35fa Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 18:58:19 +0200 Subject: Merging debian version 6.1.82-1. Signed-off-by: Daniel Baumann --- ...-powerpc-pseries-iommu-Use-a-locallock-instead-local_.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/patches-rt/0046-powerpc-pseries-iommu-Use-a-locallock-instead-local_.patch') diff --git a/debian/patches-rt/0046-powerpc-pseries-iommu-Use-a-locallock-instead-local_.patch b/debian/patches-rt/0046-powerpc-pseries-iommu-Use-a-locallock-instead-local_.patch index 9d6e8ab00..2ca129e1e 100644 --- a/debian/patches-rt/0046-powerpc-pseries-iommu-Use-a-locallock-instead-local_.patch +++ b/debian/patches-rt/0046-powerpc-pseries-iommu-Use-a-locallock-instead-local_.patch @@ -1,9 +1,9 @@ -From 1d20f49e62250211b43cbe18a087fdf19c313081 Mon Sep 17 00:00:00 2001 +From d9031d5c953c715f6d655322a79c9c62dc8af6ff Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Tue, 26 Mar 2019 18:31:54 +0100 -Subject: [PATCH 46/62] powerpc/pseries/iommu: Use a locallock instead +Subject: [PATCH 46/64] powerpc/pseries/iommu: Use a locallock instead local_irq_save() -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.69-rt21.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.82-rt27.tar.xz The locallock protects the per-CPU variable tce_page. The function attempts to allocate memory while tce_page is protected (by disabling @@ -19,7 +19,7 @@ Signed-off-by: Thomas Gleixner 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c -index 97b026130c71..01b3d19be382 100644 +index 1e5f083cdb72..b55d2bc7e40f 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -24,6 +24,7 @@ @@ -114,5 +114,5 @@ index 97b026130c71..01b3d19be382 100644 } -- -2.43.0 +2.44.0 -- cgit v1.2.3