From: Thomas Meyer <thomas@m3y3r.de>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] sys_poll(): fix function definition/negative timeout values
Date: Thu, 15 Sep 2011 14:45:56 +0200 [thread overview]
Message-ID: <1316090761.6545.70.camel@localhost.localdomain> (raw)
Fix negative timeout values for x86 userland on x86_64 kernels.
Align sys_poll() definition to glibc's definition.
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
---
fs/select.c | 2 +-
include/linux/syscalls.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/select.c b/fs/select.c
index d33418f..e782258 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -912,7 +912,7 @@ static long do_restart_poll(struct restart_block *restart_block)
}
SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
- long, timeout_msecs)
+ int, timeout_msecs)
{
struct timespec end_time, *to = NULL;
int ret;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 1ff0ec2..8f482e5 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -624,7 +624,7 @@ asmlinkage long sys_socketpair(int, int, int, int __user *);
asmlinkage long sys_socketcall(int call, unsigned long __user *args);
asmlinkage long sys_listen(int, int);
asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
- long timeout);
+ int timeout);
asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp,
fd_set __user *exp, struct timeval __user *tvp);
asmlinkage long sys_old_select(struct sel_arg_struct __user *arg);
--
1.7.6.2
next reply other threads:[~2011-09-15 12:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 12:45 Thomas Meyer [this message]
2011-09-15 17:47 ` [PATCH] sys_poll(): fix function definition/negative timeout values Andi Kleen
2011-09-15 18:05 ` Eric Dumazet
2011-09-15 18:12 ` Andi Kleen
2011-09-15 18:21 ` Eric Dumazet
2011-10-06 23:01 ` Andrew Morton
2011-09-16 17:04 ` Valdis.Kletnieks
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=1316090761.6545.70.camel@localhost.localdomain \
--to=thomas@m3y3r.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