From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus <torvalds@transmeta.com>
Cc: LKML <linux-kernel@vger.kernel.org>, Andi Kleen <ak@muc.de>
Subject: [PATCH][COMPAT] compat_sys_futex 7/7 x86_64
Date: Wed, 12 Feb 2003 16:09:05 +1100 [thread overview]
Message-ID: <20030212160905.7514b848.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20030212154716.7c101942.sfr@canb.auug.org.au>
Hi Linus,
As per Andi's wishes, here is the x86_64 part of the patch. This one will
only apply after applying my previous patch "[PATCH][COMPAT] outstanding
compatibility changes 4/4 x86_64".
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff -ruN 2.5.60-32bit.1/arch/x86_64/ia32/ia32entry.S 2.5.60-32bit.2/arch/x86_64/ia32/ia32entry.S
--- 2.5.60-32bit.1/arch/x86_64/ia32/ia32entry.S 2003-02-11 12:21:29.000000000 +1100
+++ 2.5.60-32bit.2/arch/x86_64/ia32/ia32entry.S 2003-02-11 12:21:56.000000000 +1100
@@ -440,7 +440,7 @@
.quad sys_fremovexattr
.quad sys_tkill /* 238 */
.quad sys_sendfile64
- .quad sys32_futex /* 240 */
+ .quad compay_sys_futex /* 240 */
.quad sys32_sched_setaffinity
.quad sys32_sched_getaffinity
.quad sys_set_thread_area
diff -ruN 2.5.60-32bit.1/arch/x86_64/ia32/sys_ia32.c 2.5.60-32bit.2/arch/x86_64/ia32/sys_ia32.c
--- 2.5.60-32bit.1/arch/x86_64/ia32/sys_ia32.c 2003-02-11 12:21:29.000000000 +1100
+++ 2.5.60-32bit.2/arch/x86_64/ia32/sys_ia32.c 2003-02-11 12:21:56.000000000 +1100
@@ -2199,26 +2199,6 @@
return err;
}
-extern int sys_futex(unsigned long uaddr, int op, int val, struct timespec *t);
-
-asmlinkage long
-sys32_futex(unsigned long uaddr, int op, int val, struct compat_timespec *utime32)
-{
- struct timespec t;
- mm_segment_t oldfs = get_fs();
- int err;
-
- if (utime32 && get_compat_timespec(&t, utime32))
- return -EFAULT;
-
- /* the set_fs is safe because futex doesn't use the seg limit
- for valid page checking of uaddr. */
- set_fs(KERNEL_DS);
- err = sys_futex(uaddr, op, val, utime32 ? &t : NULL);
- set_fs(oldfs);
- return err;
-}
-
extern long sys_io_setup(unsigned nr_reqs, aio_context_t *ctx);
long sys32_io_setup(unsigned nr_reqs, u32 *ctx32p)
next prev parent reply other threads:[~2003-02-12 4:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-02-12 4:47 [PATCH][COMPAT] compat_sys_futex 1/7 generic Stephen Rothwell
2003-02-12 4:51 ` [PATCH][COMPAT] compat_sys_futex 2/7 ia64 Stephen Rothwell
2003-02-12 4:55 ` [PATCH][COMPAT] compat_sys_futex 3/7 parisc Stephen Rothwell
2003-02-12 4:57 ` [PATCH][COMPAT] compat_sys_futex 4/7 ppc64 Stephen Rothwell
2003-02-12 5:00 ` [PATCH][COMPAT] compat_sys_futex 5/7 s390x Stephen Rothwell
2003-02-12 5:06 ` [PATCH][COMPAT] compat_sys_futex 6/7 sparc64 Stephen Rothwell
2003-02-12 5:09 ` Stephen Rothwell [this message]
2003-02-13 3:28 ` [PATCH][COMPAT] compat_sys_futex 7/7 x86_64 Stephen Rothwell
2003-02-12 5:26 ` [PATCH][COMPAT] compat_sys_futex 1/7 generic Linus Torvalds
2003-02-12 6:28 ` Stephen Rothwell
2003-02-15 13:51 ` [PATCH][COMPAT] compat_sys_futex 1/3 generic, parisc, ppc64, s390x and x86_64 Stephen Rothwell
2003-02-15 13:55 ` [PATCH][COMPAT] compat_sys_futex 2/3 ia64 Stephen Rothwell
2003-02-15 13:58 ` [PATCH][COMPAT] compat_sys_futex 3/3 sparc64 Stephen Rothwell
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=20030212160905.7514b848.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ak@muc.de \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®