From 43eae8169a99feefc5c87d1ac2f86e788223b1e7 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Tue, 5 Nov 2019 09:49:15 -0800 Subject: [PATCH] Remove obsolete patch debian/abi/powerpc-avoid-abi-change-for-disabling-tm.patch let us postpone an ABI bump. But with the 4.19.81 upstream release, we can no longer avoid it. --- ...pc-avoid-abi-change-for-disabling-tm.patch | 38 ------------------- debian/patches/series | 1 - 2 files changed, 39 deletions(-) delete mode 100644 debian/patches/debian/abi/powerpc-avoid-abi-change-for-disabling-tm.patch diff --git a/debian/patches/debian/abi/powerpc-avoid-abi-change-for-disabling-tm.patch b/debian/patches/debian/abi/powerpc-avoid-abi-change-for-disabling-tm.patch deleted file mode 100644 index d0ba5e5c7..000000000 --- a/debian/patches/debian/abi/powerpc-avoid-abi-change-for-disabling-tm.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Ben Hutchings -Date: Thu, 22 Aug 2019 19:26:31 +0100 -Subject: powerpc: Avoid ABI change for disabling TM -Forwarded: not-needed - -Keep the TM state in struct paca_struct and struct thread_struct even -though we won't be using it any more. - -The KVM state structures will change, but we ignore ABI changes there -since they won't affect out-of-tree modules. - ---- -Index: linux/arch/powerpc/include/asm/paca.h -=================================================================== ---- linux.orig/arch/powerpc/include/asm/paca.h -+++ linux/arch/powerpc/include/asm/paca.h -@@ -173,7 +173,7 @@ struct paca_struct { - u8 pmcregs_in_use; /* pseries puts this in lppaca */ - #endif - u64 sprg_vdso; /* Saved user-visible sprg */ --#ifdef CONFIG_PPC_TRANSACTIONAL_MEM -+#if 1 /* ifdef CONFIG_PPC_TRANSACTIONAL_MEM */ - u64 tm_scratch; /* TM scratch area for reclaim */ - #endif - -Index: linux/arch/powerpc/include/asm/processor.h -=================================================================== ---- linux.orig/arch/powerpc/include/asm/processor.h -+++ linux/arch/powerpc/include/asm/processor.h -@@ -293,7 +293,7 @@ struct thread_struct { - call or trap return */ - int used_spe; /* set if process has used spe */ - #endif /* CONFIG_SPE */ --#ifdef CONFIG_PPC_TRANSACTIONAL_MEM -+#if 1 /* ifdef CONFIG_PPC_TRANSACTIONAL_MEM */ - u8 load_tm; - u64 tm_tfhar; /* Transaction fail handler addr */ - u64 tm_texasr; /* Transaction exception & summary */ diff --git a/debian/patches/series b/debian/patches/series index 95b13f88f..a6373e2ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -331,4 +331,3 @@ bugfix/x86/i915/0012-drm-i915-gen8-Add-RC6-CTX-corruption-WA.patch bugfix/x86/i915/drm-i915-cmdparser-fix-jump-whitelist-clearing.patch # ABI maintenance -debian/abi/powerpc-avoid-abi-change-for-disabling-tm.patch