[PATCH] Minor inconveniences for 2.2.9 on PPC

Andreas Bogk (andreas@andreas.org)
10 Jun 1999 18:56:09 +0200


Hi!

This patch fixes two problems for 2.2.9 on PowerPC. The first bug
prevents the kernel from compiling due to a missing #include
statement.

The second one is related to the UDF driver. The UDF driver includes
linux/fs.h, which in turn includes asm/bitops.h, in order to provide
bit-fiddling functions to the user. This is fine for i386, where ffs()
is defined in asm/bitops.h. On PowerPC, however, ffs() is defined as
generic_ffs(), which in turn is defined in linux/bitops.h. Since
linux/bitops.h includes asm/bitops.h, including linux/bitops.h in
linux/fs.h is the right thing to do.

diff -r -u linux-2.2.9/arch/ppc/kernel/syscalls.c linux-2.2.9ab1/arch/ppc/kernel/syscalls.c
--- linux-2.2.9/arch/ppc/kernel/syscalls.c Sat May 8 20:14:01 1999
+++ linux-2.2.9ab1/arch/ppc/kernel/syscalls.c Wed May 19 18:36:23 1999
@@ -32,2 +32,3 @@
#include <linux/mman.h>
+#include <linux/file.h>
#include <linux/sys.h>
diff -r -u linux-2.2.9/include/linux/fs.h linux-2.2.9ab1/include/linux/fs.h
--- linux-2.2.9/include/linux/fs.h Tue May 11 19:35:44 1999
+++ linux-2.2.9ab1/include/linux/fs.h Thu Jun 10 17:43:57 1999
@@ -22,3 +22,3 @@
#include <asm/atomic.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
#include <asm/cache.h>

Andreas

-- 
Reality is two's complement. See:
ftp://ftp.netcom.com/pub/hb/hbaker/hakmem/hacks.html#item154

- 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/