
Fix arch/m68knommu for gcc 3.3
Patch submitted by Bernardo Innocenti <bernie@develer.com>

Applies as-is to linux-2.4.20-uc0 (20030522)


diff -u -3 -p -r1.1.1.1 kmap.c
--- linux-2.4.x/arch/m68knommu/mm/kmap.c	22 Jan 2002 00:34:24 -0000	1.1.1.1
+++ linux-2.4.x/arch/m68knommu/mm/kmap.c	16 Jun 2003 21:16:43 -0000
@@ -9,7 +9,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/malloc.h>
 #include <linux/vmalloc.h>
 
 #include <asm/setup.h>
diff -u -3 -p -r1.1 ram.ld
--- linux-2.4.x/arch/m68knommu/platform/5272/Develer/ram.ld	12 Mar 2003 13:19:21 -0000	1.1
+++ linux-2.4.x/arch/m68knommu/platform/5272/Develer/ram.ld	16 Jun 2003 21:16:43 -0000
@@ -12,6 +12,7 @@ SECTIONS {
 		*(.text.lock)
 		*(.exitcall.exit)
 		*(.rodata)
+		*(.rodata.*)
         	*(.modinfo)
 		. = ALIGN(0x4) ;
 		*(.kstrtab)
diff -u -3 -p -r1.1.1.3 ints.c
--- linux-2.4.x/arch/m68knommu/platform/5307/ints.c	16 May 2003 01:06:15 -0000	1.1.1.3
+++ linux-2.4.x/arch/m68knommu/platform/5307/ints.c	16 Jun 2003 21:16:44 -0000
@@ -51,25 +51,22 @@ static void default_irq_handler(int irq,
 
 #if defined( CONFIG_BOARD_UC5272 )
  
-asm ("
-	.global _start, __ramend
-	.section .romvec
- 
-e_vectors:
-	.long _ramend-4, _start, buserr, trap, trap, trap, trap, trap
-	.long trap, trap, trap, trap, trap, trap, trap, trap
-	.long trap, trap, trap, trap, trap, trap, trap, trap
-	.long inthandler, inthandler, inthandler, inthandler
-	.long inthandler, inthandler, inthandler, inthandler
+asm (
+	"\t.global _start, __ramend\n\t"
+	".section .romvec\n"
+"e_vectors:\n\t"
+	".long _ramend-4, _start, buserr, trap, trap, trap, trap, trap\n\t"
+	".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"
+	".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"
+	".long inthandler, inthandler, inthandler, inthandler\n\t"
+	".long inthandler, inthandler, inthandler, inthandler\n\t"
 	/* TRAP #0-15 */
-	.long system_call, trap, trap, trap, trap, trap, trap, trap
-	.long trap, trap, trap, trap, trap, trap, trap, trap
-	.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-	.text
-
-ignore: rte
- 
-");
+	".long system_call, trap, trap, trap, trap, trap, trap, trap\n\t"
+	".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"
+	".long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\n\t"
+	".text\n"
+"ignore: rte\n"
+);
 #endif /* CONFIG_BOARD_UC5272 */
 
 
diff -u -3 -p -r1.1.1.2 semaphore.h
--- linux-2.4.x/include/asm-m68knommu/semaphore.h	28 Feb 2003 22:45:03 -0000	1.1.1.2
+++ linux-2.4.x/include/asm-m68knommu/semaphore.h	16 Jun 2003 21:16:57 -0000
@@ -146,7 +146,7 @@ extern inline int down_trylock(struct se
 		".previous"
 		: "=d" (result)
 		: "a" (sem1)
-		: "%d0", "memory");
+		: "memory");
 	return result;
 }
 
diff -u -3 -p -r1.1.1.4 rtnetlink.c
--- linux-2.4.x/net/core/rtnetlink.c	28 Feb 2003 22:45:18 -0000	1.1.1.4
+++ linux-2.4.x/net/core/rtnetlink.c	16 Jun 2003 21:17:01 -0000
@@ -394,7 +394,7 @@ err_inval:
  * Malformed skbs with wrong lengths of messages are discarded silently.
  */
 
-extern __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
+static inline int rtnetlink_rcv_skb(struct sk_buff *skb)
 {
 	int err;
 	struct nlmsghdr * nlh;
