[PATCH 1/1] mktree: s390: don't hard-code clone-with-pids syscall

[PATCH 1/1] mktree: s390: don't hard-code clone-with-pids syscall

[Serge E. Hallyn]

Use __NR_clone_with_pids (from asm/unistd.h) as an immediate
value instead.

Signed-off-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 mktree.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mktree.c b/mktree.c
index 76a71ac..0782068 100644
--- a/mktree.c
+++ b/mktree.c
@@ -1829,11 +1829,12 @@ static int clone_with_pids(int (*fn)(void *), void *child_stack, int flags,
 	register unsigned long int __r7 asm ("7") = (unsigned long int)(setp); \
 	register unsigned long int __result asm ("2"); \
 	__asm__ __volatile__( \
-		" lghi %%r1,332\n" \
+		" lghi %%r1,%7\n" \
 		" svc 0\n" \
 		: "=d" (__result) \
 		: "0" (__r2), "d" (__r3), \
-		  "d" (__r4), "d" (__r5), "d" (__r6), "d" (__r7) \
+		  "d" (__r4), "d" (__r5), "d" (__r6), "d" (__r7), \
+		  "i" (__NR_clone_with_pids) \
 		: "1", "cc", "memory" \
 	); \
 		__result; \
-- 
1.6.1.1

Re: [PATCH 1/1] mktree: s390: don't hard-code clone-with-pids syscall

[Oren Laadan]

applied to ckpt-v17-rc1.

Oren.

Serge E. Hallyn wrote:
> Use __NR_clone_with_pids (from asm/unistd.h) as an immediate
> value instead.
> 
> Signed-off-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  mktree.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/mktree.c b/mktree.c
> index 76a71ac..0782068 100644
> --- a/mktree.c
> +++ b/mktree.c
> @@ -1829,11 +1829,12 @@ static int clone_with_pids(int (*fn)(void *), void *child_stack, int flags,
>  	register unsigned long int __r7 asm ("7") = (unsigned long int)(setp); \
>  	register unsigned long int __result asm ("2"); \
>  	__asm__ __volatile__( \
> -		" lghi %%r1,332\n" \
> +		" lghi %%r1,%7\n" \
>  		" svc 0\n" \
>  		: "=d" (__result) \
>  		: "0" (__r2), "d" (__r3), \
> -		  "d" (__r4), "d" (__r5), "d" (__r6), "d" (__r7) \
> +		  "d" (__r4), "d" (__r5), "d" (__r6), "d" (__r7), \
> +		  "i" (__NR_clone_with_pids) \
>  		: "1", "cc", "memory" \
>  	); \
>  		__result; \