Merge tag 'locking-urgent-2026-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipgrafted

Pull futex fix from Ingo Molnar:

 - Also allocate a default private futex hash on vfork() as well, to
   avoid races with (private) futex waiters (Peter Zijlstra)

* tag 'locking-urgent-2026-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Also allocate private hash on vfork()

1 files changed, 75 insertions, 0 deletions

diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c
new file mode 100644
index 000000000..0fee8edb8
--- /dev/null
+++ b/drivers/clocksource/mmio.c
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Generic MMIO clocksource support
+ */
+#include <linux/clocksource.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+
+struct clocksource_mmio {
+	void __iomem *reg;
+	struct clocksource clksrc;
+};
+
+static inline struct clocksource_mmio *to_mmio_clksrc(struct clocksource *c)
+{
+	return container_of(c, struct clocksource_mmio, clksrc);
+}
+
+u64 clocksource_mmio_readl_up(struct clocksource *c)
+{
+	return (u64)readl_relaxed(to_mmio_clksrc(c)->reg);
+}
+EXPORT_SYMBOL_GPL(clocksource_mmio_readl_up);
+
+u64 clocksource_mmio_readl_down(struct clocksource *c)
+{
+	return ~(u64)readl_relaxed(to_mmio_clksrc(c)->reg) & c->mask;
+}
+EXPORT_SYMBOL_GPL(clocksource_mmio_readl_down);
+
+u64 clocksource_mmio_readw_up(struct clocksource *c)
+{
+	return (u64)readw_relaxed(to_mmio_clksrc(c)->reg);
+}
+EXPORT_SYMBOL_GPL(clocksource_mmio_readw_up);
+
+u64 clocksource_mmio_readw_down(struct clocksource *c)
+{
+	return ~(u64)readw_relaxed(to_mmio_clksrc(c)->reg) & c->mask;
+}
+EXPORT_SYMBOL_GPL(clocksource_mmio_readw_down);
+
+/**
+ * clocksource_mmio_init - Initialize a simple mmio based clocksource
+ * @base:	Virtual address of the clock readout register
+ * @name:	Name of the clocksource
+ * @hz:		Frequency of the clocksource in Hz
+ * @rating:	Rating of the clocksource
+ * @bits:	Number of valid bits
+ * @read:	One of clocksource_mmio_read*() above
+ */
+int clocksource_mmio_init(void __iomem *base, const char *name,
+			  unsigned long hz, int rating, unsigned bits,
+			  u64 (*read)(struct clocksource *))
+{
+	struct clocksource_mmio *cs;
+
+	if (bits > 64 || bits < 16)
+		return -EINVAL;
+
+	cs = kzalloc_obj(struct clocksource_mmio);
+	if (!cs)
+		return -ENOMEM;
+
+	cs->reg = base;
+	cs->clksrc.name = name;
+	cs->clksrc.rating = rating;
+	cs->clksrc.read = read;
+	cs->clksrc.mask = CLOCKSOURCE_MASK(bits);
+	cs->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS;
+
+	return clocksource_register_hz(&cs->clksrc, hz);
+}
+EXPORT_SYMBOL_GPL(clocksource_mmio_init);