[packages/kernel/LINUX_5_15] - rethunk code fixed upstream, rel 2

[baggins]

commit cafe45b1dcdc18aaa48f6216dd3514d5fbc11a15
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jun 17 03:52:44 2025 +0200

    - rethunk code fixed upstream, rel 2

 kernel-small_fixes.patch | 46 ----------------------------------------------
 kernel.spec              |  2 +-
 2 files changed, 1 insertion(+), 47 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index e75ad08b..14da39dc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -65,7 +65,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		5.15
 %define		postver		.185
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 24442d4c..dc2c31ff 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -107,49 +107,3 @@ diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacra
  
  	if (dev->msi_enabled)
 
---- linux-5.15/arch/x86/kernel/alternative.c.orig	2025-05-24 14:33:00.616663327 +0200
-+++ linux-5.15/arch/x86/kernel/alternative.c	2025-05-24 14:42:49.963329920 +0200
-@@ -359,6 +359,21 @@
- 	return insn->opcode.bytes[0] == 0x0f && (insn->opcode.bytes[1] & 0xf0) == 0x80;
- }
- 
-+bool cpu_wants_rethunk(void)
-+{
-+	return cpu_feature_enabled(X86_FEATURE_RETHUNK);
-+}
-+
-+bool cpu_wants_rethunk_at(void *addr)
-+{
-+	if (!cpu_feature_enabled(X86_FEATURE_RETHUNK))
-+		return false;
-+	if (x86_return_thunk != its_return_thunk)
-+		return true;
-+
-+	return !((unsigned long)addr & 0x20);
-+}
-+
- #if defined(CONFIG_RETPOLINE) && defined(CONFIG_STACK_VALIDATION)
- 
- /*
-@@ -749,21 +764,6 @@
- 
- #ifdef CONFIG_RETHUNK
- 
--bool cpu_wants_rethunk(void)
--{
--	return cpu_feature_enabled(X86_FEATURE_RETHUNK);
--}
--
--bool cpu_wants_rethunk_at(void *addr)
--{
--	if (!cpu_feature_enabled(X86_FEATURE_RETHUNK))
--		return false;
--	if (x86_return_thunk != its_return_thunk)
--		return true;
--
--	return !((unsigned long)addr & 0x20);
--}
--
- /*
-  * Rewrite the compiler generated return thunk tail-calls.
-  *
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/cafe45b1dcdc18aaa48f6216dd3514d5fbc11a15