* linux-next: manual merge of the akpm tree with the signal tree
@ 2012-10-16 2:53 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-10-16 2:53 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Catalin Marinas, Al Viro
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/arm64/kernel/sys_compat.c between commit 0fe8f08036a2 ("arm64: Use
generic sys_execve() implementation") from the signal tree and commit
"compat: generic compat_sys_sched_rr_get_interval implementation" from
the akpm 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/arm64/kernel/sys_compat.c
index d140b73,fd8ae6e..0000000
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@@ -49,21 -49,24 +49,6 @@@ asmlinkage int compat_sys_vfork(struct
regs, 0, NULL, NULL);
}
- asmlinkage int compat_sys_sched_rr_get_interval(compat_pid_t pid,
- struct compat_timespec __user *interval)
- {
- struct timespec t;
- int ret;
- mm_segment_t old_fs = get_fs();
-
- set_fs(KERNEL_DS);
- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
- set_fs(old_fs);
- if (put_compat_timespec(&t, interval))
- return -EFAULT;
- return ret;
- }
-
-asmlinkage int compat_sys_execve(const char __user *filenamei,
- compat_uptr_t argv, compat_uptr_t envp,
- struct pt_regs *regs)
-{
- int error;
- struct filename *filename;
-
- filename = getname(filenamei);
- error = PTR_ERR(filename);
- if (IS_ERR(filename))
- goto out;
- error = compat_do_execve(filename->name, compat_ptr(argv),
- compat_ptr(envp), regs);
- putname(filename);
-out:
- return error;
-}
-
static inline void
do_compat_cache_op(unsigned long start, unsigned long end, int flags)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the akpm tree with the signal tree
@ 2012-11-26 13:08 Stephen Rothwell
2012-11-26 16:49 ` Catalin Marinas
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-11-26 13:08 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Al Viro
[-- Attachment #1: Type: text/plain, Size: 2092 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/arm64/kernel/sys_compat.c arch/arm64/include/asm/unistd.h between
commit 8709876911bd ("arm64: sanitize copy_thread(), switch to generic
fork/vfork/clone") from the signal tree and commit "compat: generic
compat_sys_sched_rr_get_interval() implementation" from the akpm 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/arm64/include/asm/unistd.h
index d69aeea,1a7c88c..0000000
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@@ -24,9 -24,7 +24,10 @@@
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
#define __ARCH_WANT_COMPAT_SYS_SENDFILE
+#define __ARCH_WANT_SYS_FORK
+#define __ARCH_WANT_SYS_VFORK
+ #define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
#endif
#define __ARCH_WANT_SYS_EXECVE
+#define __ARCH_WANT_SYS_CLONE
#include <uapi/asm/unistd.h>
diff --cc arch/arm64/kernel/sys_compat.c
index f7b05ed,c34c81d..0000000
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@@ -28,21 -28,17 +28,6 @@@
#include <asm/cacheflush.h>
#include <asm/unistd32.h>
- asmlinkage int compat_sys_sched_rr_get_interval(compat_pid_t pid,
- struct compat_timespec __user *interval)
- {
- struct timespec t;
- int ret;
- mm_segment_t old_fs = get_fs();
-
- set_fs(KERNEL_DS);
- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
- set_fs(old_fs);
- if (put_compat_timespec(&t, interval))
- return -EFAULT;
- return ret;
- }
-
-asmlinkage int compat_sys_fork(void)
-{
- return do_fork(SIGCHLD, 0, current_pt_regs(), 0, NULL, NULL);
-}
-
-asmlinkage int compat_sys_vfork(void)
-{
- return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0,
- current_pt_regs(), 0, NULL, NULL);
-}
-
static inline void
do_compat_cache_op(unsigned long start, unsigned long end, int flags)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the signal tree
2012-11-26 13:08 Stephen Rothwell
@ 2012-11-26 16:49 ` Catalin Marinas
0 siblings, 0 replies; 3+ messages in thread
From: Catalin Marinas @ 2012-11-26 16:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Andrew Morton, linux-next, linux-kernel, Al Viro
On 26 November 2012 13:08, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Today's linux-next merge of the akpm tree got a conflict in
> arch/arm64/kernel/sys_compat.c arch/arm64/include/asm/unistd.h between
> commit 8709876911bd ("arm64: sanitize copy_thread(), switch to generic
> fork/vfork/clone") from the signal tree and commit "compat: generic
> compat_sys_sched_rr_get_interval() implementation" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks fine to me. Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-26 16:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-16 2:53 linux-next: manual merge of the akpm tree with the signal tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-11-26 13:08 Stephen Rothwell
2012-11-26 16:49 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox