Hi Jiri, On Fri, 04 Dec 2009 08:59:22 +0100 Jiri Slaby <jirislaby@xxxxxxxxx> wrote: > > On 12/04/2009 08:30 AM, Stephen Rothwell wrote: > > diff --cc arch/x86/ia32/ia32entry.S > > index da89ae1,c61ced2..0000000 > > --- a/arch/x86/ia32/ia32entry.S > > +++ b/arch/x86/ia32/ia32entry.S > > @@@ -841,7 -841,6 +841,9 @@@ ia32_sys_call_table > > .quad compat_sys_pwritev > > .quad compat_sys_rt_tgsigqueueinfo /* 335 */ > > .quad sys_perf_event_open > > + .quad compat_sys_recvmmsg > > + .quad sys_fanotify_init > > + .quad sys32_fanotify_mark > > + .quad compat_sys_getprlimit > > Thanks, but please go on with the by-five numbering in comments. I am sure that will be done by whoever does the final conflict resolution. Thanks for noticing. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp9605CUsd1Y.pgp
Description: PGP signature
