Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d91686a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k,m68knommu: Wire up fanotify_init, fanotify_mark, and prlimit64
parents ab22c17c edc805b7

arch/m68k/include/asm/unistd.h

+4 −1
Original line number Diff line number Diff line
@@ -340,10 +340,13 @@ 
#define __NR_set_thread_area	334

#define __NR_atomic_cmpxchg_32	335

#define __NR_atomic_barrier	336

#define __NR_fanotify_init	337

#define __NR_fanotify_mark	338

#define __NR_prlimit64		339



#ifdef __KERNEL__



#define NR_syscalls		337

#define NR_syscalls		340



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/m68k/kernel/entry.S

+3 −0
Original line number Diff line number Diff line
@@ -765,4 +765,7 @@ sys_call_table: 
	.long sys_set_thread_area

	.long sys_atomic_cmpxchg_32	/* 335 */

	.long sys_atomic_barrier

	.long sys_fanotify_init

	.long sys_fanotify_mark

	.long sys_prlimit64

arch/m68knommu/kernel/syscalltable.S

+3 −0
Original line number Diff line number Diff line
@@ -355,6 +355,9 @@ ENTRY(sys_call_table) 
	.long sys_set_thread_area

	.long sys_atomic_cmpxchg_32	/* 335 */

	.long sys_atomic_barrier

	.long sys_fanotify_init

	.long sys_fanotify_mark

	.long sys_prlimit64



	.rept NR_syscalls-(.-sys_call_table)/4

		.long sys_ni_syscall