diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2025-07-09 11:51:34 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2025-07-09 11:51:34 +0200 |
commit | 068f7b64bf2054e20bbbd0782aa11f6ff8d17105 (patch) | |
tree | f9f88dfe79f4be4789480dc22f74908b3484a8f8 /rust/helpers | |
parent | 8959338617a85e35820e3a7fa21801cf55b068bf (diff) | |
parent | e04c78d86a9699d136910cfc0bdcf01087e3267e (diff) |
Merge v6.16-rc2 into timers/ptp
to pick up the __GENMASK() fix, otherwise the AUX clock VDSO patches fail
to compile for compat.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'rust/helpers')
-rw-r--r-- | rust/helpers/cpu.c | 8 | ||||
-rw-r--r-- | rust/helpers/helpers.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/rust/helpers/cpu.c b/rust/helpers/cpu.c new file mode 100644 index 000000000000..824e0adb19d4 --- /dev/null +++ b/rust/helpers/cpu.c @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/smp.h> + +unsigned int rust_helper_raw_smp_processor_id(void) +{ + return raw_smp_processor_id(); +} diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c index 0f1b5d115985..16fa9bca5949 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -13,6 +13,7 @@ #include "build_assert.c" #include "build_bug.c" #include "clk.c" +#include "cpu.c" #include "cpufreq.c" #include "cpumask.c" #include "cred.c" |