From: mikpe@csd.uu.se
To: ak@suse.de
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH][2.5.66] ioctl32 breakage on x86_64
Date: Thu, 3 Apr 2003 16:51:55 +0200 [thread overview]
Message-ID: <16012.19083.730422.148040@enequist.it.uu.se> (raw)
IA32 emulation on x86_64 doesn't compile in 2.5.66 due to
conflicting declarations of sys_ioctl(). The patch below
is a quick fix to make both the generic ioctl32 one and
x86_64's private one agree with reality.
/Mikael
--- linux-2.5.66/arch/x86_64/ia32/ia32_ioctl.c.~1~ 2003-03-08 17:22:31.000000000 +0100
+++ linux-2.5.66/arch/x86_64/ia32/ia32_ioctl.c 2003-04-03 15:24:12.000000000 +0200
@@ -121,7 +121,7 @@
#define EXT2_IOC32_GETVERSION _IOR('v', 1, int)
#define EXT2_IOC32_SETVERSION _IOW('v', 2, int)
-extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
+extern asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
static int w_long(unsigned int fd, unsigned int cmd, unsigned long arg)
{
--- linux-2.5.66/include/linux/ioctl32.h.~1~ 2003-03-25 22:17:40.000000000 +0100
+++ linux-2.5.66/include/linux/ioctl32.h 2003-04-03 15:22:49.000000000 +0200
@@ -3,7 +3,7 @@
struct file;
-extern long sys_ioctl(unsigned int, unsigned int, unsigned long);
+extern asmlinkage long sys_ioctl(unsigned int, unsigned int, unsigned long);
/*
* Register an 32bit ioctl translation handler for ioctl cmd.
next reply other threads:[~2003-04-03 14:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-04-03 14:51 mikpe [this message]
2003-04-03 15:14 ` Andi Kleen
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=16012.19083.730422.148040@enequist.it.uu.se \
--to=mikpe@csd.uu.se \
--cc=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
/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®