Skip to content

Commit 9903efb

Browse files
committed
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
2 parents 651ab78 + 63e2f40 commit 9903efb

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

include/linux/syscalls.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,9 +859,15 @@ asmlinkage long sys_prlimit64(pid_t pid, unsigned int resource,
859859
const struct rlimit64 __user *new_rlim,
860860
struct rlimit64 __user *old_rlim);
861861
asmlinkage long sys_fanotify_init(unsigned int flags, unsigned int event_f_flags);
862+
#if defined(CONFIG_ARCH_SPLIT_ARG64)
863+
asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
864+
unsigned int mask_1, unsigned int mask_2,
865+
int dfd, const char __user * pathname);
866+
#else
862867
asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
863868
u64 mask, int fd,
864869
const char __user *pathname);
870+
#endif
865871
asmlinkage long sys_name_to_handle_at(int dfd, const char __user *name,
866872
struct file_handle __user *handle,
867873
int __user *mnt_id, int flag);

0 commit comments

Comments
 (0)