* linux-next: manual merge of the signal tree with the sparc tree
@ 2012-10-29 3:00 Stephen Rothwell
2012-10-29 3:02 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-10-29 3:00 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/sparc/kernel/sys_sparc_64.c between commit 517ffce4e1a0 ("sparc64:
Make montmul/montsqr/mpmul usable in 32-bit threads") from the sparc tree
and commit 2f12af35a988 ("sparc64: switch to generic kernel_execve()")
from the signal tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/sparc/kernel/sys_sparc_64.c
index 878ef3d,adfe60e..0000000
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@@ -729,30 -729,3 +729,8 @@@ SYSCALL_DEFINE5(rt_sigaction, int, sig
return ret;
}
+
- /*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
- int kernel_execve(const char *filename,
- const char *const argv[],
- const char *const envp[])
- {
- long __res;
- register long __g1 __asm__ ("g1") = __NR_execve;
- register long __o0 __asm__ ("o0") = (long)(filename);
- register long __o1 __asm__ ("o1") = (long)(argv);
- register long __o2 __asm__ ("o2") = (long)(envp);
- asm volatile ("t 0x6d\n\t"
- "sub %%g0, %%o0, %0\n\t"
- "movcc %%xcc, %%o0, %0\n\t"
- : "=r" (__res), "=&r" (__o0)
- : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1)
- : "cc");
- return __res;
- }
-
+asmlinkage long sys_kern_features(void)
+{
+ return KERN_FEATURE_MIXED_MODE_STACK;
+}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the signal tree with the sparc tree
2012-10-29 3:00 linux-next: manual merge of the signal tree with the sparc tree Stephen Rothwell
@ 2012-10-29 3:02 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-10-29 3:02 UTC (permalink / raw)
To: sfr; +Cc: viro, linux-next, linux-kernel
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Oct 2012 14:00:32 +1100
> Today's linux-next merge of the signal tree got a conflict in
> arch/sparc/kernel/sys_sparc_64.c between commit 517ffce4e1a0 ("sparc64:
> Make montmul/montsqr/mpmul usable in 32-bit threads") from the sparc tree
> and commit 2f12af35a988 ("sparc64: switch to generic kernel_execve()")
> from the signal tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
I intend to pull the sparc tree into sparc-next, then pull the sparc
branch from Al's tree into sparc-next to fix this up.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-29 3:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-29 3:00 linux-next: manual merge of the signal tree with the sparc tree Stephen Rothwell
2012-10-29 3:02 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).