diff options
| author | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
| commit | 068f7b64bf2054e20bbbd0782aa11f6ff8d17105 (patch) | |
| tree | f9f88dfe79f4be4789480dc22f74908b3484a8f8 /fs/bcachefs/chardev.c | |
| parent | timekeeping: Remove the temporary CLOCK_AUX workaround (diff) | |
| parent | Linux 6.16-rc2 (diff) | |
| download | kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.tar.gz kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.zip | |
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 <[email protected]>
Diffstat (limited to 'fs/bcachefs/chardev.c')
| -rw-r--r-- | fs/bcachefs/chardev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/chardev.c b/fs/bcachefs/chardev.c index 2d38466eddfd..fde3c2380e28 100644 --- a/fs/bcachefs/chardev.c +++ b/fs/bcachefs/chardev.c @@ -399,7 +399,7 @@ static long bch2_ioctl_data(struct bch_fs *c, return ret; } -static long bch2_ioctl_fs_usage(struct bch_fs *c, +static noinline_for_stack long bch2_ioctl_fs_usage(struct bch_fs *c, struct bch_ioctl_fs_usage __user *user_arg) { struct bch_ioctl_fs_usage arg = {}; @@ -469,7 +469,7 @@ err: } /* obsolete, didn't allow for new data types: */ -static long bch2_ioctl_dev_usage(struct bch_fs *c, +static noinline_for_stack long bch2_ioctl_dev_usage(struct bch_fs *c, struct bch_ioctl_dev_usage __user *user_arg) { struct bch_ioctl_dev_usage arg; |