From: Miklos Szeredi <miklos@szeredi.hu>
Date: Mon, 13 Sep 2004 14:56:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: fuse_1_9~13
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=442d96559f69616c5ddb4a859dd29a5bbee8804c;p=qemu-gpiodev%2Flibfuse.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index b5219f1..8f083f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 	* Make requests non-interruptible so race with FORGET is avoided.
 	This is only a temporary solution
+
+	* Support compiling FUSE kernel module on 2.4.x UML kernels
 	
 2004-09-09  Miklos Szeredi <miklos@szeredi.hu>
 
diff --git a/configure.in b/configure.in
index 7e715c7..0e76491 100644
--- a/configure.in
+++ b/configure.in
@@ -91,13 +91,16 @@ if test "$enable_kernel_module" != "no"; then
 
 	isuml=no
 	KERNELMAKE_PARAMS=
+	KERNELCPPFLAGS=
 	AC_MSG_CHECKING([if this is user mode linux])
 	if test -f $kernelsrc/include/linux/autoconf.h && grep -q "^#define CONFIG_USERMODE 1" $kernelsrc/include/linux/autoconf.h; then
 		isuml=yes
 		KERNELMAKE_PARAMS="ARCH=um"
+		KERNELCPPFLAGS="-D__arch_um__ -DSUBARCH=\\\"i386\\\" -D_LARGEFILE64_SOURCE -I${kernelsrc}/arch/um/include -Derrno=kernel_errno -I${kernelsrc}/arch/um/kernel/tt/include -I${kernelsrc}/arch/um/kernel/skas/include"
 	fi
 	AC_MSG_RESULT([$isuml])
 	AC_SUBST(KERNELMAKE_PARAMS)
+	AC_SUBST(KERNELCPPFLAGS)
 fi
 
 if test "$enable_lib" != "no"; then
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index bcd792f..aa6dd60 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -43,7 +43,7 @@ ifeq ($(majver), 2.4)
 CC = @CC@
 LD = @LD@
 CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe 
-CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"@VERSION@\"
+CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"@VERSION@\" @KERNELCPPFLAGS@
 
 fuse_objs = dev.o dir.o file.o inode.o util.o compat/parser.o