Re: Linux 2.4.22-pre3

[margitsw@t-online.de (Margit Schubert-While)]

[-- Attachment #1: Type: text/plain, Size: 1031 bytes --]

Erros/unresolved as below.
Attached patch fixes sdla_chdlc, sbni and mark_page_accessed.
The sonyapi I don't know. Seems like we should export acpi_disabled in
kernel/setup.c.
The comx is an ongoing fight :-)

Margit


sdla_chdlc.c:594:43: missing terminating " character
sdla_chdlc.c: In function `wpc_init':
sdla_chdlc.c:595: error: parse error before "Failed"
sdla_chdlc.c:595: error: stray '\' in program
sdla_chdlc.c:595:68: missing terminating " character
make[3]: *** [sdla_chdlc.o] Error 1

sbni.c: In function `calc_crc32':
sbni.c:1558: error: asm-specifier for variable `_crc' conflicts with asm 
clobber list
make[3]: *** [sbni.o] Error 1

depmod: *** Unresolved symbols in 
/lib/modules/2.4.22-pre3/kernel/drivers/char/sonypi.o
depmod:         acpi_disabled
depmod: *** Unresolved symbols in 
/lib/modules/2.4.22-pre3/kernel/drivers/net/wan/comx.o
depmod:         proc_get_inode
depmod: *** Unresolved symbols in 
/lib/modules/2.4.22-pre3/kernel/fs/hfsplus/hfsplus.o
depmod:         mark_page_accessed


         Margit

[-- Attachment #2: patchpre3 --]
[-- Type: application/octet-stream, Size: 2006 bytes --]

diff -Naur linux-2.4.22pre2/drivers/net/wan/sbni.c linux-2.4.22pre2mw0/drivers/net/wan/sbni.c
--- linux-2.4.22pre2/drivers/net/wan/sbni.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.22pre2mw0/drivers/net/wan/sbni.c	2003-07-04 18:26:26.000000000 +0200
@@ -1552,13 +1552,13 @@
 static u32
 calc_crc32( u32  crc,  u8  *p,  u32  len )
 {
-	register u32  _crc __asm ( "ax" );
+	register u32  _crc;
 	_crc = crc;
 	
 	__asm __volatile (
 		"xorl	%%ebx, %%ebx\n"
-		"movl	%1, %%esi\n" 
-		"movl	%2, %%ecx\n" 
+		"movl	%2, %%esi\n" 
+		"movl	%3, %%ecx\n" 
 		"movl	$crc32tab, %%edi\n"
 		"shrl	$2, %%ecx\n"
 		"jz	1f\n"
@@ -1594,7 +1594,7 @@
 		"jnz	0b\n"
 
 	"1:\n"
-		"movl	%2, %%ecx\n"
+		"movl	%3, %%ecx\n"
 		"andl	$3, %%ecx\n"
 		"jz	2f\n"
 
@@ -1619,9 +1619,9 @@
 		"xorb	2(%%esi), %%bl\n"
 		"xorl	(%%edi,%%ebx,4), %%eax\n"
 	"2:\n"
-		:
-		: "a" (_crc), "g" (p), "g" (len)
-		: "ax", "bx", "cx", "dx", "si", "di"
+		: "=a" (_crc)
+		: "0" (_crc), "g" (p), "g" (len)
+		: "bx", "cx", "dx", "si", "di"
 	);
 
 	return  _crc;
diff -Naur linux-2.4.22pre2/drivers/net/wan/sdla_chdlc.c linux-2.4.22pre2mw0/drivers/net/wan/sdla_chdlc.c
--- linux-2.4.22pre2/drivers/net/wan/sdla_chdlc.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.22pre2mw0/drivers/net/wan/sdla_chdlc.c	2003-07-04 17:20:19.000000000 +0200
@@ -591,8 +591,7 @@
 	
 
 		if (chdlc_set_intr_mode(card, APP_INT_ON_TIMER)){
-			printk (KERN_INFO "%s: 
-				Failed to set interrupt triggers!\n",
+			printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
 				card->devname);
 			return -EIO;	
         	}
diff -Naur linux-2.4.22pre2/mm/filemap.c linux-2.4.22pre2mw0/mm/filemap.c
--- linux-2.4.22pre2/mm/filemap.c	2003-06-30 09:52:45.000000000 +0200
+++ linux-2.4.22pre2mw0/mm/filemap.c	2003-07-05 15:22:40.000000000 +0200
@@ -1338,6 +1338,8 @@
 		SetPageReferenced(page);
 }
 
+EXPORT_SYMBOL(mark_page_accessed);
+
 /*
  * This is a generic file read routine, and uses the
  * inode->i_op->readpage() function for the actual low-level