[patch] for mol-0.9.72.1 with kernels >= 2.6.23

mol-0.9.72.1-2.6.23.patch (text/plain), 6.12 KB, created by Didier Cardoso on 2008-11-11 15:48:15 UTC

diff -Nru mol-0.9.72.1/src/drivers/disk/aes.c mol-0.9.72.1-2.6.23/src/drivers/disk/aes.c
--- mol-0.9.72.1/src/drivers/disk/aes.c	2007-06-25 19:52:17.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/drivers/disk/aes.c	2008-11-11 12:50:19.000000000 +0100
@@ -27,7 +27,6 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <stdio.h>
 #include "aes.h"
 
 #define NDEBUG
diff -Nru mol-0.9.72.1/src/drivers/disk/blk_dmg.c mol-0.9.72.1-2.6.23/src/drivers/disk/blk_dmg.c
--- mol-0.9.72.1/src/drivers/disk/blk_dmg.c	2007-06-25 19:52:17.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/drivers/disk/blk_dmg.c	2008-11-11 12:50:32.000000000 +0100
@@ -26,7 +26,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdio.h>
 #include "blk_dmg.h"
 
 /* Read 64 bit value */
diff -Nru mol-0.9.72.1/src/kmod/Linux/dev.c mol-0.9.72.1-2.6.23/src/kmod/Linux/dev.c
--- mol-0.9.72.1/src/kmod/Linux/dev.c	2007-06-25 19:52:19.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/kmod/Linux/dev.c	2008-11-11 13:00:33.000000000 +0100
@@ -85,7 +85,11 @@
 	}
 #endif	/* < Linux 2.6.21 */
 	do {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
+		if( !(p=(int*)of_get_property(dn, "reg", &len)) || len != sizeof(int[2]) ) {
+#else
 		if( !(p=(int*)get_property(dn, "reg", &len)) || len != sizeof(int[2]) ) {
+#endif
 			of_node_put(dn);
 			return 0;
 		}
diff -Nru mol-0.9.72.1/src/kmod/Linux/Makefile.26 mol-0.9.72.1-2.6.23/src/kmod/Linux/Makefile.26
--- mol-0.9.72.1/src/kmod/Linux/Makefile.26	2007-06-25 19:52:19.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/kmod/Linux/Makefile.26	2008-11-11 15:34:56.000000000 +0100
@@ -9,11 +9,13 @@
 obj-m		:= _kuname.o mol.o 
 
 PERFOBJS	= $(addprefix $(obj)/, $(PERFOBJS_))
-MOL_ASMFLAGS	= $(CPPFLAGS) $(ASMFLAGS) $(INCLUDES) -D__ASSEMBLY__
+K_FLAGS		= -Iinclude -include include/linux/autoconf.h -Iarch/ppc -Iarch/ppc/include \
+		  -I$(src) -I$(src)/../../../include $(INCLUDES) -D__KERNEL__
+MOL_ASMFLAGS	= $(CPPFLAGS) $(ASMFLAGS) $(K_FLAGS) -D__ASSEMBLY__
+LDFLAGS_MODULE  = $(LDFLAGS_BUILD_ID)
 
 ### This is ugly, but it should fix the issues people have building as a user
-T		= "/tmp"
-
+T		= $(src)
 
 $(obj)/_traps.o:	$(src)/asm_offsets.h $(src)/traps.S $(src)/*.S $(src)/*.h
 
@@ -29,7 +31,7 @@
 $(obj)/_%.o: $(src)/%.S
 	@echo "  AS [x]   $@"
 	@rm -f $@ $@.s
-	@$(CPP) $(MOL_ASMFLAGS) $< | m4 -s > $@.m4
+	@$(CPP) $(M_INC) $(MOL_ASMFLAGS) $< | m4 -s > $@.m4
 	@ASFILTER="./asfilter" ; test -x $$ASFILTER || ASFILTER="tr ';' '\n'" ; \
 	cat $@.m4 | $$ASFILTER > $@.s
 	@$(AS) $@.s $(AS_FLAGS) -o $@
@@ -39,7 +41,7 @@
 $(src)/asm_offsets.h:	$(src)/archinclude.h $(src)/kernel_vars.h $(src)/mac_registers.h
 $(src)/asm_offsets.h:	$(src)/asm_offsets.c $(src)/asm_offsets.inc
 	@rm -f ${T}/tmp-offsets.c $@ ; cat $^ > ${T}/tmp-offsets.c
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -I$(src) -Wall -S ${T}/tmp-offsets.c -o ${T}/tmp-offsets.s
+	@$(CC) $(CPPFLAGS) $(CFLAGS) $(K_FLAGS) -Wall -S ${T}/tmp-offsets.c -o ${T}/tmp-offsets.s
 	@echo "/* WARNING! Automatically generated from 'shared/asm_offsets.c' - DO NOT EDIT! */" > $@
 	@grep '^#' ${T}/tmp-offsets.s >> $@
 	@rm -f ${T}/tmp-offsets.*
diff -Nru mol-0.9.72.1/src/kmod/Linux/misc.c mol-0.9.72.1-2.6.23/src/kmod/Linux/misc.c
--- mol-0.9.72.1/src/kmod/Linux/misc.c	2007-06-25 19:52:19.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/kmod/Linux/misc.c	2008-11-11 13:10:27.000000000 +0100
@@ -26,6 +26,7 @@
 
 #define MMU	kv->mmu
 
+/* Is there a better way to share between User and Kernel? */
 kernel_vars_t *
 alloc_kvar_pages( void )
 {
@@ -48,6 +49,7 @@
 	return kv;
 }
 
+/* Releases the memory we allocated before */
 void
 free_kvar_pages( kernel_vars_t *kv )
 {
diff -Nru mol-0.9.72.1/src/kmod/Linux/mmu.c mol-0.9.72.1-2.6.23/src/kmod/Linux/mmu.c
--- mol-0.9.72.1/src/kmod/Linux/mmu.c	2007-06-25 19:52:19.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/kmod/Linux/mmu.c	2008-11-11 13:11:46.000000000 +0100
@@ -29,6 +29,7 @@
 void		(*xx_store_pte_lowmem)( ulong *slot, int pte0, int pte1 );
 #endif
 
+/* Makes a copy of the mmu context for MOL */
 int
 arch_mmu_init( kernel_vars_t *kv )
 {
diff -Nru mol-0.9.72.1/src/netdriver/Makefile.26 mol-0.9.72.1-2.6.23/src/netdriver/Makefile.26
--- mol-0.9.72.1/src/netdriver/Makefile.26	2007-06-25 19:52:17.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/netdriver/Makefile.26	2008-11-11 15:35:36.000000000 +0100
@@ -1,5 +1,7 @@
 # -*- makefile -*-
 
+LDFLAGS_MODULE  = $(LDFLAGS_BUILD_ID)
+
 obj-$(BUILD_SHEEP)	+= sheep.o
 obj-$(BUILD_TAP)	+= ethertap.o
 obj-$(BUILD_TUN)	+= tun.o
diff -Nru mol-0.9.72.1/src/netdriver/sheep.c mol-0.9.72.1-2.6.23/src/netdriver/sheep.c
--- mol-0.9.72.1/src/netdriver/sheep.c	2007-06-25 19:52:17.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/netdriver/sheep.c	2008-11-11 15:43:48.000000000 +0100
@@ -82,7 +82,7 @@
 #ifdef LINUX_26
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
-#define compat_sk_alloc(a,b,c)  sk_alloc( (a), (b), &mol_proto, 1 )
+#define compat_sk_alloc(a,b,c)  sk_alloc(&init_net, (a), (b), &mol_proto)
 #else
 #define compat_sk_alloc(a,b,c)	sk_alloc( (a), (b), (c), NULL )
 #endif
@@ -558,7 +558,7 @@
 		name[19] = 0;
 
 		// Find card
-		if( !(v->ether=dev_get_by_name(name)) )
+		if( !(v->ether=dev_get_by_name(&init_net, name)) )
 			return -ENODEV;
 
 		// Is it Ethernet?
diff -Nru mol-0.9.72.1/src/shared/mac_registers.h mol-0.9.72.1-2.6.23/src/shared/mac_registers.h
--- mol-0.9.72.1/src/shared/mac_registers.h	2007-06-25 19:52:18.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/shared/mac_registers.h	2008-11-11 15:31:18.000000000 +0100
@@ -111,7 +111,9 @@
 
 #define NUM_MREGS_PAGES		((sizeof(mac_regs_t)+0xfff)/0x1000)
 
+#ifndef BIT
 #define	BIT(n)			(1U<<(31-(n)))	/* bit 0 is MSB */
+#endif
 
 #ifndef __KERNEL__
 extern mac_regs_t *mregs;
diff -Nru mol-0.9.72.1/src/shared/mol-ioctl.h mol-0.9.72.1-2.6.23/src/shared/mol-ioctl.h
--- mol-0.9.72.1/src/shared/mol-ioctl.h	2007-06-25 19:52:18.000000000 +0200
+++ mol-0.9.72.1-2.6.23/src/shared/mol-ioctl.h	2008-11-11 13:13:19.000000000 +0100
@@ -18,6 +18,9 @@
 #define _H_MOL_IOCTL
 
 #ifndef __ASSEMBLY__
+#ifdef __linux__
+#include <linux/ioctl.h>
+#endif	/* __linux__ */
 #include "mmutypes.h"
 
 typedef struct {