@@ -1,7 +1,7 @@

 %define debug_package %{nil}

 Summary:        Linux API header files

 Name:           linux-api-headers

-Version:        6.1.39

+Version:        6.1.45

 Release:        1%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

@@ -9,7 +9,7 @@ Group:          System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz

-%define sha512 linux=20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41

+%define sha512 linux=9a30afa4dbbf899aab8722574a3b914b2547beb0b36a7d80bd45f694f1649e974c6769700d3b5494bbd71964ba4f6b1ab430588266a08a38bc940871bb963e81

 BuildArch:      noarch

 %description

 The Linux API Headers expose the kernel's API for use by Glibc.

@@ -39,6 +39,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %{_includedir}/*

 %changelog

+* Mon Aug 14 2023 Ajay Kaher <akaher@vmware.com> 6.1.45-1

+- Update to version 6.1.45

 * Thu Jul 20 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 6.1.39-1

 - Update to version 6.1.39

 * Tue Jul 04 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 6.1.37-1

@@ -303,6 +303,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y

 # Kernel Features

 # ARM errata workarounds via the alternatives framework

+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y

 CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y

 CONFIG_ARM64_ERRATUM_826319=y

 CONFIG_ARM64_ERRATUM_827319=y

@@ -437,7 +437,9 @@ CONFIG_RETHUNK=y

 CONFIG_CPU_UNRET_ENTRY=y

 CONFIG_CPU_IBPB_ENTRY=y

 CONFIG_CPU_IBRS_ENTRY=y

+CONFIG_CPU_SRSO=y

 # CONFIG_SLS is not set

+# CONFIG_GDS_FORCE_MITIGATION is not set

 CONFIG_ARCH_HAS_ADD_PAGES=y

 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

@@ -559,6 +561,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y

 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y

 CONFIG_ARCH_HAS_SET_MEMORY=y

 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y

+CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y

 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y

 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y

 CONFIG_ARCH_WANTS_NO_INSTR=y

@@ -507,7 +507,9 @@ CONFIG_RETHUNK=y

 CONFIG_CPU_UNRET_ENTRY=y

 CONFIG_CPU_IBPB_ENTRY=y

 CONFIG_CPU_IBRS_ENTRY=y

+CONFIG_CPU_SRSO=y

 # CONFIG_SLS is not set

+# CONFIG_GDS_FORCE_MITIGATION is not set

 CONFIG_ARCH_HAS_ADD_PAGES=y

 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

@@ -693,6 +695,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y

 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y

 CONFIG_ARCH_HAS_SET_MEMORY=y

 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y

+CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y

 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y

 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y

 CONFIG_ARCH_WANTS_NO_INSTR=y

@@ -479,7 +479,9 @@ CONFIG_RETHUNK=y

 CONFIG_CPU_UNRET_ENTRY=y

 CONFIG_CPU_IBPB_ENTRY=y

 CONFIG_CPU_IBRS_ENTRY=y

+CONFIG_CPU_SRSO=y

 # CONFIG_SLS is not set

+# CONFIG_GDS_FORCE_MITIGATION is not set

 CONFIG_ARCH_HAS_ADD_PAGES=y

 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

@@ -697,6 +699,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y

 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y

 CONFIG_ARCH_HAS_SET_MEMORY=y

 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y

+CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y

 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y

 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y

 CONFIG_ARCH_WANTS_NO_INSTR=y

@@ -322,6 +322,7 @@ CONFIG_ARCH_ZYNQMP=y

 # Kernel Features

 # ARM errata workarounds via the alternatives framework

+CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y

 CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y

 CONFIG_ARM64_ERRATUM_826319=y

 CONFIG_ARM64_ERRATUM_827319=y

@@ -493,7 +493,9 @@ CONFIG_RETHUNK=y

 CONFIG_CPU_UNRET_ENTRY=y

 CONFIG_CPU_IBPB_ENTRY=y

 CONFIG_CPU_IBRS_ENTRY=y

+CONFIG_CPU_SRSO=y

 # CONFIG_SLS is not set

+# CONFIG_GDS_FORCE_MITIGATION is not set

 CONFIG_ARCH_HAS_ADD_PAGES=y

 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

@@ -710,6 +712,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y

 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y

 CONFIG_ARCH_HAS_SET_MEMORY=y

 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y

+CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y

 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y

 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y

 CONFIG_ARCH_WANTS_NO_INSTR=y

@@ -3,19 +3,25 @@ From: Keerthana K <keerthanak@vmware.com>

 Date: Fri, 17 Jun 2022 14:32:26 +0000

 Subject: [PATCH] scripts-kallsyms: Extra kallsyms parsing

+From: Keerthana K <keerthanak@vmware.com>

+

 Adding new option "--extra-symbols=<kallsyms-file>" to scripts/kallsyms.c

 This helps in adding required symbols to vmlinux when CONFIG_KALLSYMS_ALL

 is disabled.

+

+Signed-off-by: Keerthana K <keerthanak@vmware.com>

+[Ajay: Regenerated the patch for v6.1.45]

+Signed-off-by: Ajay Kaher <akaher@vmware.com>

 ---

- scripts/kallsyms.c      | 108 +++++++++++++++++++++++++++++++++++-----

+ scripts/kallsyms.c      | 111 ++++++++++++++++++++++++++++++++++++++++++------

  scripts/link-vmlinux.sh |   2 +

- 2 files changed, 98 insertions(+), 12 deletions(-)

+ 2 files changed, 101 insertions(+), 12 deletions(-)

 diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c

-index 03fa07ad4..e8b0d024c 100644

+index 80aab2a..5b2aa41 100644

 --- a/scripts/kallsyms.c

 +++ b/scripts/kallsyms.c

-@@ -25,6 +25,8 @@

+@@ -26,6 +26,8 @@

  #include <string.h>

  #include <ctype.h>

  #include <limits.h>

@@ -24,7 +30,7 @@ index 03fa07ad4..e8b0d024c 100644

  #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))

-@@ -61,10 +63,15 @@ struct addr_range {

+@@ -63,10 +65,15 @@ struct addr_range {

  static unsigned long long _text;

  static unsigned long long relative_base;

@@ -40,24 +46,24 @@ index 03fa07ad4..e8b0d024c 100644

  #define text_range_text     (&text_ranges[0])

  #define text_range_inittext (&text_ranges[1])

-@@ -75,6 +82,7 @@ static struct addr_range percpu_range = {

+@@ -77,6 +84,7 @@ static struct addr_range percpu_range = {

  static struct sym_entry **table;

  static unsigned int table_size, table_cnt;

  static int all_symbols;

 +static int extra_symbols;

  static int absolute_percpu;

  static int base_relative;

- 

-@@ -87,7 +95,7 @@ static unsigned char best_table_len[256];

+ static int lto_clang;

+@@ -90,7 +98,7 @@ static unsigned char best_table_len[256];

  static void usage(void)

  {

 -	fprintf(stderr, "Usage: kallsyms [--all-symbols] [--absolute-percpu] "

 +	fprintf(stderr, "Usage: kallsyms --extra-symbols=<kallsyms-file> [--all-symbols] [--absolute-percpu] "

- 			"[--base-relative] in.map > out.S\n");

+ 			"[--base-relative] [--lto-clang] in.map > out.S\n");

  	exit(1);

  }

-@@ -211,6 +219,55 @@ static void check_symbol_range(const char *sym, unsigned long long addr,

+@@ -215,6 +223,55 @@ static void check_symbol_range(const char *sym, unsigned long long addr,

  	}

  }

@@ -113,7 +119,7 @@ index 03fa07ad4..e8b0d024c 100644

  static struct sym_entry *read_symbol(FILE *in)

  {

  	char name[KSYM_NAME_LEN_BUFFER+1], type;

-@@ -281,10 +338,17 @@ static int symbol_in_range(const struct sym_entry *s,

+@@ -285,10 +342,17 @@ static int symbol_in_range(const struct sym_entry *s,

  static int symbol_valid(const struct sym_entry *s)

  {

  	const char *name = sym_name(s);

@@ -131,7 +137,7 @@ index 03fa07ad4..e8b0d024c 100644

  		if (symbol_in_range(s, text_ranges,

  				    ARRAY_SIZE(text_ranges)) == 0)

  			return 0;

-@@ -813,25 +877,44 @@ static void record_relative_base(void)

+@@ -883,26 +947,48 @@ static void record_relative_base(void)

  int main(int argc, char **argv)

  {

@@ -140,17 +146,18 @@ index 03fa07ad4..e8b0d024c 100644

 -			{"all-symbols",     no_argument, &all_symbols,     1},

 -			{"absolute-percpu", no_argument, &absolute_percpu, 1},

 -			{"base-relative",   no_argument, &base_relative,   1},

+-			{"lto-clang",       no_argument, &lto_clang,       1},

 -			{},

 -		};

--

--		int c = getopt_long(argc, argv, "", long_options, NULL);

 +	char *sym_file = NULL;

 +	int opt = 0, index = 0;

-+

+ 

+-		int c = getopt_long(argc, argv, "", long_options, NULL);

 +	static struct option long_options[] = {

 +		{"all-symbols",     no_argument,       NULL, 'l'},

 +		{"absolute-percpu", no_argument,       NULL, 'a'},

 +		{"base-relative",   no_argument,       NULL, 'b'},

++		{"lto-clang",       no_argument,       NULL, 'c'},

 +		{"extra-symbols",   required_argument, NULL, 's'},

 +		{},

 +	};

@@ -167,6 +174,9 @@ index 03fa07ad4..e8b0d024c 100644

 +			break;

 +		case 'b':

 +			base_relative = 1;

++			break;

++		case 'c':

++			lto_clang = 1;

  			break;

 -		if (c != 0)

 +		case 's':

@@ -187,7 +197,7 @@ index 03fa07ad4..e8b0d024c 100644

  	read_map(argv[optind]);

  	shrink_table();

  	if (absolute_percpu)

-@@ -842,5 +925,6 @@ int main(int argc, char **argv)

+@@ -913,5 +999,6 @@ int main(int argc, char **argv)

  	optimize_token_table();

  	write_src();

@@ -195,11 +205,11 @@ index 03fa07ad4..e8b0d024c 100644

  	return 0;

  }

 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh

-index 918470d76..58d3210e5 100755

+index 32e5739..85d9115 100755

 --- a/scripts/link-vmlinux.sh

 +++ b/scripts/link-vmlinux.sh

-@@ -156,6 +156,8 @@ kallsyms()

- 		kallsymopt="${kallsymopt} --base-relative"

+@@ -160,6 +160,8 @@ kallsyms()

+ 		kallsymopt="${kallsymopt} --lto-clang"

  	fi

 +	kallsymopt="${kallsymopt} --extra-symbols=crypto/fips_canister-kallsyms"

@@ -1,6 +1,6 @@

-From 2f7412ba9c6af5ab16bdbb4a3fdb1dcd2b4fd3c2 Mon Sep 17 00:00:00 2001

+From 91ad0689c9d94c1b12b47fac687b860e85593775 Mon Sep 17 00:00:00 2001

 From: Thomas Gleixner <tglx@linutronix.de>

-Date: Mon, 4 Dec 2017 15:07:46 +0100

+Date: Wed, 30 Aug 2023 11:38:29 +0530

 Subject: [PATCH] x86/entry: Align entry text section to PMD boundary

 The (irq)entry text must be visible in the user space page tables. To allow

@@ -17,6 +17,9 @@ code. There is no security risk of doing that. As a bonus, we reduce

 kernel size by 40%. 2MB aligning increases kernel .text size from

 6MB to 10MB, by adding padding between and after entry text.

+[Ajay] Reverting only ALIGN_ENTRY_TEXT_END, ALIGN_ENTRY_TEXT_BEGIN

+requires for SRSO (Speculative Return Stack Overflow).

+

 Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>

 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

 Cc: Andy Lutomirski <luto@kernel.org>

@@ -40,42 +43,37 @@ Cc: hughd@google.com

 Cc: keescook@google.com

 Signed-off-by: Ingo Molnar <mingo@kernel.org>

 ---

- arch/x86/kernel/vmlinux.lds.S | 7 -------

- 1 file changed, 7 deletions(-)

+ arch/x86/kernel/vmlinux.lds.S | 3 ---

+ 1 file changed, 3 deletions(-)

 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S

-index d2a8b5a24a44..1e413a9326aa 100644

+index fd03f5a..478857c 100644

 --- a/arch/x86/kernel/vmlinux.lds.S

 +++ b/arch/x86/kernel/vmlinux.lds.S

-@@ -66,9 +66,6 @@ jiffies = jiffies_64;

- 		__end_rodata_hpage_align = .;			\

+@@ -67,7 +67,6 @@ jiffies = jiffies_64;

  		__end_rodata_aligned = .;

--#define ALIGN_ENTRY_TEXT_BEGIN	. = ALIGN(PMD_SIZE);

+ #define ALIGN_ENTRY_TEXT_BEGIN	. = ALIGN(PMD_SIZE);

 -#define ALIGN_ENTRY_TEXT_END	. = ALIGN(PMD_SIZE);

--

+ 

  /*

   * This section contains data which will be mapped as decrypted. Memory

-  * encryption operates on a page basis. Make this section PMD-aligned

-@@ -93,8 +90,6 @@ jiffies = jiffies_64;

- 		. = ALIGN(PAGE_SIZE);				\

+@@ -94,7 +93,6 @@ jiffies = jiffies_64;

  		__end_rodata_aligned = .;

--#define ALIGN_ENTRY_TEXT_BEGIN

+ #define ALIGN_ENTRY_TEXT_BEGIN

 -#define ALIGN_ENTRY_TEXT_END

  #define BSS_DECRYPTED

  #endif

-@@ -132,9 +127,7 @@ SECTIONS

- 		CPUIDLE_TEXT

- 		LOCK_TEXT

- 		KPROBES_TEXT

--		ALIGN_ENTRY_TEXT_BEGIN

- 		ENTRY_TEXT

+@@ -147,7 +145,6 @@ SECTIONS

+ 		. = srso_untrain_ret_alias | (1 << 2) | (1 << 8) | (1 << 14) | (1 << 20);

+ 		*(.text.__x86.rethunk_safe)

+ #endif

 -		ALIGN_ENTRY_TEXT_END

  		SOFTIRQENTRY_TEXT

  		STATIC_CALL_TEXT

  		*(.gnu.warning)

 -- 

-2.11.0

+2.7.4

@@ -22,8 +22,8 @@

 Summary:        Kernel

 Name:           linux-esx

-Version:        6.1.41

-Release:        2%{?kat_build:.kat}%{?dist}

+Version:        6.1.45

+Release:        1%{?kat_build:.kat}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org

 Group:          System Environment/Kernel

@@ -34,7 +34,7 @@ Distribution:   Photon

 %define _modulesdir /lib/modules/%{uname_r}

 Source0:        http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz

-%define sha512 linux=82101034257f746e1b6717d374a7960c1a83f93e8c2912e159c6eda6ea7605ff3c8505d37cc55ee0aadaddc964475c7ece4c26ed60407877d6eeaa7938de7c91

+%define sha512 linux=9a30afa4dbbf899aab8722574a3b914b2547beb0b36a7d80bd45f694f1649e974c6769700d3b5494bbd71964ba4f6b1ab430588266a08a38bc940871bb963e81

 Source1:        config-esx_%{_arch}

 Source2:        initramfs.trigger

@@ -505,6 +505,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 %{_usrsrc}/linux-headers-%{uname_r}

 %changelog

+* Wed Nov 22 2023 Ajay Kaher <akaher@vmware.com> 6.1.45-1

+- Update to version 6.1.45

 * Wed Nov 22 2023 Ajay Kaher <akaher@vmware.com> 6.1.41-2

 - Fix: unconditional preserve CR4.MCE

 * Wed Nov 22 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 6.1.41-1

@@ -15,8 +15,8 @@

 Summary:        Kernel

 Name:           linux-rt

-Version:        6.1.41

-Release:        4%{?kat_build:.kat}%{?dist}

+Version:        6.1.45

+Release:        1%{?kat_build:.kat}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org

 Group:          System Environment/Kernel

@@ -29,7 +29,7 @@ Distribution:   Photon

 %define _modulesdir /lib/modules/%{uname_r}

 Source0:        http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz

-%define sha512 linux=82101034257f746e1b6717d374a7960c1a83f93e8c2912e159c6eda6ea7605ff3c8505d37cc55ee0aadaddc964475c7ece4c26ed60407877d6eeaa7938de7c91

+%define sha512 linux=9a30afa4dbbf899aab8722574a3b914b2547beb0b36a7d80bd45f694f1649e974c6769700d3b5494bbd71964ba4f6b1ab430588266a08a38bc940871bb963e81

 %ifarch x86_64

 Source1:    config-rt

@@ -520,6 +520,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 %{_usrsrc}/linux-headers-%{uname_r}

 %changelog

+* Wed Nov 22 2023 Ajay Kaher <akaher@vmware.com> 6.1.45-1

+- Update to version 6.1.45

 * Wed Nov 22 2023 Kuntal Nayak <nkuntal@vmware.com> 6.1.41-4

 - Enable Kconfig CONFIG_KEXEC_FILE for kexec signature verify

 * Wed Nov 22 2023 Srish Srinivasan <ssrish@vmware.com> 6.1.41-3

@@ -15,8 +15,8 @@

 Summary:        Kernel

 Name:           linux-secure

-Version:        6.1.41

-Release:        3%{?kat_build:.kat}%{?dist}

+Version:        6.1.45

+Release:        1%{?kat_build:.kat}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org

 Group:          System Environment/Kernel

@@ -27,7 +27,7 @@ Distribution:   Photon

 %define _modulesdir /lib/modules/%{uname_r}

 Source0:        http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz

-%define sha512 linux=82101034257f746e1b6717d374a7960c1a83f93e8c2912e159c6eda6ea7605ff3c8505d37cc55ee0aadaddc964475c7ece4c26ed60407877d6eeaa7938de7c91

+%define sha512 linux=9a30afa4dbbf899aab8722574a3b914b2547beb0b36a7d80bd45f694f1649e974c6769700d3b5494bbd71964ba4f6b1ab430588266a08a38bc940871bb963e81

 Source1:        config-secure

 Source2:        initramfs.trigger

 # contains pre, postun, filetriggerun tasks

@@ -428,6 +428,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 %endif

 %changelog

+* Wed Nov 22 2023 Ajay Kaher <akaher@vmware.com> 6.1.45-1

+- Update to version 6.1.45

 * Wed Nov 22 2023 Kuntal Nayak <nkuntal@vmware.com> 6.1.41-3

 - Enable Kconfig CONFIG_KEXEC_FILE for kexec signature verify

 * Wed Nov 22 2023 Ajay Kaher <akaher@vmware.com> 6.1.41-2

@@ -22,8 +22,8 @@

 Summary:        Kernel

 Name:           linux

-Version:        6.1.41

-Release:        4%{?kat_build:.kat}%{?dist}

+Version:        6.1.45

+Release:        1%{?kat_build:.kat}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -34,7 +34,7 @@ Distribution:   Photon

 %define _modulesdir /lib/modules/%{uname_r}

 Source0:        http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz

-%define sha512 linux=82101034257f746e1b6717d374a7960c1a83f93e8c2912e159c6eda6ea7605ff3c8505d37cc55ee0aadaddc964475c7ece4c26ed60407877d6eeaa7938de7c91

+%define sha512 linux=9a30afa4dbbf899aab8722574a3b914b2547beb0b36a7d80bd45f694f1649e974c6769700d3b5494bbd71964ba4f6b1ab430588266a08a38bc940871bb963e81

 Source1:        config_%{_arch}

 Source2:        initramfs.trigger

@@ -714,6 +714,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 %{_datadir}/bash-completion/completions/bpftool

 %changelog

+* Wed Nov 22 2023 Ajay Kaher <akaher@vmware.com> 6.1.45-1

+- Update to version 6.1.45

 * Wed Nov 22 2023 Srish Srinivasan <ssrish@vmware.com> 6.1.41-4

 - Enable CONFIG_DEBUG_INFO_BTF=y

 * Wed Nov 22 2023 Kuntal Nayak <nkuntal@vmware.com> 6.1.41-3

@@ -3618,16 +3618,6 @@ index 3b9e86108..b6159f89a 100644

  	struct hrtimer *timer = &cpuctx->hrtimer;

  	struct pmu *pmu = cpuctx->ctx.pmu;

  	unsigned long flags;

-@@ -11155,8 +11156,7 @@ perf_event_mux_interval_ms_store(struct device *dev,

- 		cpuctx = per_cpu_ptr(pmu->pmu_cpu_context, cpu);

- 		cpuctx->hrtimer_interval = ns_to_ktime(NSEC_PER_MSEC * timer);

- 

--		cpu_function_call(cpu,

--			(remote_function_f)perf_mux_hrtimer_restart, cpuctx);

-+		cpu_function_call(cpu, perf_mux_hrtimer_restart, cpuctx);

- 	}

- 	cpus_read_unlock();

- 	mutex_unlock(&mux_interval_mutex);

 diff --git a/kernel/module/main.c b/kernel/module/main.c

 index 7a627345d..bcac0eee0 100644

 --- a/kernel/module/main.c