Merge tag 'asm-generic-fixes-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic fix from Arnd Bergmann: "This fixes up a last minute build regression from the previous set of bug fixes" * tag 'asm-generic-fixes-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: syscalls: fix sys_fanotify_mark prototype
This commit is contained in:
@@ -859,9 +859,15 @@ asmlinkage long sys_prlimit64(pid_t pid, unsigned int resource,
|
||||
const struct rlimit64 __user *new_rlim,
|
||||
struct rlimit64 __user *old_rlim);
|
||||
asmlinkage long sys_fanotify_init(unsigned int flags, unsigned int event_f_flags);
|
||||
#if defined(CONFIG_ARCH_SPLIT_ARG64)
|
||||
asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
|
||||
unsigned int mask_1, unsigned int mask_2,
|
||||
int dfd, const char __user * pathname);
|
||||
#else
|
||||
asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
|
||||
u64 mask, int fd,
|
||||
const char __user *pathname);
|
||||
#endif
|
||||
asmlinkage long sys_name_to_handle_at(int dfd, const char __user *name,
|
||||
struct file_handle __user *handle,
|
||||
int __user *mnt_id, int flag);
|
||||
|
||||
Reference in New Issue
Block a user