Build on 2.4.21

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 616329223afcfd64714643271394b198c78aa4d5..0fd5ad186101ce0fbfa48792ab9583026cd8fa1c 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -89,7 +89,7 @@ CCFLAGS =   $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -ffixed-r13 \
         -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step
 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL ${SMP_DEF} -DMODULE
 <all>
-INCLUDES = -I. -I../ -I${TOP_SRCDIR}/config
+INCLUDES = -I. -I../ -I${LINUX_KERNEL_PATH}/include -I${TOP_SRCDIR}/config
 
 CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES)
 

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 0eacd8aaec83d5f03544807d8c3d9bd7e0cd3c6b..921e7a2d8c88bb8e84118d696cce16bb046f3fd9 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -33,7 +33,10 @@ typedef unsigned short                  etap_event_t;
 #include "../h/disp.h"
 #endif
 #include "../h/socket.h"
-#ifndef AFS_LINUX22_ENV
+#ifdef AFS_LINUX22_ENV
+#define _LINUX_CODA_FS_I
+struct coda_inode_info {};
+#else
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV)
@@ -80,8 +83,6 @@ typedef unsigned short                  etap_event_t;
 #include "../h/user.h"
 #endif
 #ifdef AFS_LINUX22_ENV
-#define _LINUX_CODA_FS_I
-struct coda_inode_info {};
 #include "../h/sched.h"
 #include "../h/netdevice.h"
 #else