summaryrefslogtreecommitdiffstats
path: root/fs/fcntl.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/fcntl.c
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r--fs/fcntl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 255267da8..d6cebd646 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -259,7 +259,7 @@ out:
/* Table to convert sigio signal codes into poll band bitmaps */
-static int band_table[NSIGPOLL+1] = {
+static long band_table[NSIGPOLL+1] = {
~0,
POLLIN | POLLRDNORM, /* POLL_IN */
POLLOUT | POLLWRNORM | POLLWRBAND, /* POLL_OUT */
@@ -291,7 +291,7 @@ static void send_sigio_to_task(struct task_struct *p,
si.si_errno = 0;
si.si_code = reason;
if (reason < 0 || reason > NSIGPOLL)
- si.si_band = ~0;
+ si.si_band = ~0L;
else
si.si_band = band_table[reason];
si.si_fd = fa->fa_fd;