[PATCH] to 2.4.0-test4-pre6, alpha, osf_select & KFDS_NR (poll.h breakage)

From: Andrew van der Stock (ajv@greebo.net)
Date: Thu Jul 13 2000 - 10:09:04 EST


Somebody ripped stuff out of poll.h and forgot to compile on an alpha.

osf_sys.c: In function `osf_select':
osf_sys.c:1079: `KFDS_NR' undeclared (first use in this function)
osf_sys.c:1079: (Each undeclared identifier is reported only once
osf_sys.c:1079: for each function it appears in.)
make[1]: *** [osf_sys.o] Error 1
make[1]: Leaving directory `/usr/src/linux/arch/alpha/kernel'
make: *** [_dir_arch/alpha/kernel] Error 2

This patch restores - in a very hacky way - compilation of the kernel on the
alpha. Someone with a (much) greater understanding of poll.h should grep
their way through the kernel sources and have a go at fixing up the other
breakages.

diff -u linux/arch/alpha/kernel/osf_sys.c.orig
linux/arch/alpha/kernel/osf_sys.c
--- linux/arch/alpha/kernel/osf_sys.c.orig Fri Jul 14 01:06:48 2000
+++ linux/arch/alpha/kernel/osf_sys.c Fri Jul 14 01:03:47 2000
@@ -1076,8 +1076,12 @@
        }

        ret = -EINVAL;
+#define KFDS_64BLOCK ((PAGE_SIZE/(6*64))*64)
+#define KFDS_NR (KFDS_64BLOCK*8 > NR_OPEN ? NR_OPEN : KFDS_64BLOCK*8)
        if (n < 0 || n > KFDS_NR)
                goto out_nofds;
+#undef KFDS_64BLOCK
+#undef KFDS_NR

        /*
         * We need 6 bitmaps (in/out/ex for both incoming and outgoing),

thanks,

Andrew van der Stock, ajv@greebo.net http://www.greebo.net
SAGE-AU President http://www.sage-au.org.au

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jul 15 2000 - 21:00:17 EST