From: Heiko Carstens <heiko.carstens@de•ibm.com>
To: Eric Paris <eparis@redhat•com>
Cc: Sachin Sant <sachinp@in•ibm.com>,
linux-s390@vger•kernel.org,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org,
Andrew Morton <akpm@linux-foundation•org>,
Martin Schwidefsky <schwidefsky@de•ibm.com>
Subject: Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)
Date: Tue, 17 Nov 2009 16:50:29 +0100 [thread overview]
Message-ID: <20091117155029.GG5124@osiris.boeblingen.de.ibm.com> (raw)
In-Reply-To: <1258471436.2876.34.camel@dhcp231-106.rdu.redhat.com>
On Tue, Nov 17, 2009 at 10:23:56AM -0500, Eric Paris wrote:
> On Tue, 2009-11-17 at 14:55 +0100, Heiko Carstens wrote:
>
> > Yes, also some places should have used lgfr instead of llgfr for proper sign
> > extension. But please, just drop the s390 bits from your patch.
> > Its easier and less painful for us to do it ourselves instead of reviewing
> > and fixing these things. (No offence intended!).
>
> dropped and won't show up in -next tomorrow.
>
> This what I thought it should be and would love to read if you say it's
> right....
Yes, it is except for one thing:
> diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
> index cb5232d..8962161 100644
> --- a/arch/s390/include/asm/unistd.h
> +++ b/arch/s390/include/asm/unistd.h
> @@ -269,7 +269,9 @@
> #define __NR_pwritev 329
> #define __NR_rt_tgsigqueueinfo 330
> #define __NR_perf_event_open 331
> -#define NR_syscalls 332
> +#define __NR_fanotify_init 332
> +#define __NR_fanotify_mark 333
> +#define NR_syscalls 334
>
> /*
> * There are some system calls that are not present on 64 bit, some
> diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
> index cbd9901..c81723d 100644
> --- a/arch/s390/kernel/compat_wrapper.S
> +++ b/arch/s390/kernel/compat_wrapper.S
> @@ -1855,3 +1855,20 @@ sys32_execve_wrapper:
> llgtr %r3,%r3 # compat_uptr_t *
> llgtr %r4,%r4 # compat_uptr_t *
> jg sys32_execve # branch to system call
> +
> + .globl sys_fanotify_init_wrapper
> +sys_fanotify_init_wrapper:
> + llgfr %r2,%r2 # unsigned int
> + llgfr %r3,%r3 # unsigned int
> + llgfr %r4,%r4 # unsigned int
> + jg sys_fanotify_init # branch to system call
The third argument an int and hence it should have been lgfr ;)
next prev parent reply other threads:[~2009-11-17 15:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-17 8:53 linux-next: Tree for November 17 Stephen Rothwell
2009-11-17 12:06 ` [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S) Sachin Sant
2009-11-17 12:52 ` Heiko Carstens
2009-11-17 13:40 ` Eric Paris
2009-11-17 13:55 ` Heiko Carstens
2009-11-17 15:23 ` Eric Paris
2009-11-17 15:50 ` Heiko Carstens [this message]
2009-11-17 15:57 ` Eric Paris
2009-11-17 16:14 ` Heiko Carstens
2009-11-18 7:04 ` Heiko Carstens
2009-11-18 9:27 ` Russell King
2009-11-18 14:49 ` Ralf Baechle
2009-11-18 16:02 ` Eric Paris
2009-11-18 16:22 ` Heiko Carstens
2009-11-18 17:34 ` Martin Schwidefsky
2009-11-18 18:41 ` Heiko Carstens
2009-11-19 8:54 ` Martin Schwidefsky
2009-11-18 17:24 ` Eric Paris
2009-11-17 17:02 ` linux-next: Tree for November 17 (exofs) Randy Dunlap
2009-11-17 17:08 ` Boaz Harrosh
2009-11-17 17:10 ` Boaz Harrosh
2009-11-17 17:24 ` Boaz Harrosh
2009-11-17 17:48 ` Randy Dunlap
2009-11-17 18:17 ` [PATCH -next] sep: fix 2 warnings Randy Dunlap
2009-11-17 18:29 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091117155029.GG5124@osiris.boeblingen.de.ibm.com \
--to=heiko.carstens@de$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=eparis@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=sachinp@in$(echo .)ibm.com \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox