[LV-kern-commit] CVS: kernel-2.4/arch/sparc/kernel check_asm.sh,1.2,1.3 devices.c,1.1.1.1,1.2 ebus.c,1.2,1.3 init_task.c,1.2,1.3 pcic.c,1.2,1.3 time.c,1.2,1.3 unaligned.c,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/sparc/kernel

Modified Files:
	check_asm.sh devices.c ebus.c init_task.c pcic.c time.c 
	unaligned.c 
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)


Index: check_asm.sh
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel/check_asm.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- check_asm.sh	10 Apr 2002 15:17:42 -0000	1.2
+++ check_asm.sh	10 Jun 2003 01:46:16 -0000	1.3
@@ -1,12 +1,12 @@
 #!/bin/sh
 case $1 in
   -printf)
-    sed -n -e '/struct[ 	]*'$2'_struct[ 	]*{/,/};/p' < $3 | sed '/struct[ 	]*'$2'_struct[ 	]*{/d;/:[0-9]*[ 	]*;/d;/^[ 	]*$/d;/};/d;s/^[ 	]*//;s/volatile[ 	]*//;s/\(unsigned\|signed\|struct\)[ 	]*//;s/\(\[\|__attribute__\).*;[ 	]*$//;s/(\*//;s/)(.*)//;s/;[ 	]*$//;s/^[^ 	]*[ 	]*//;s/,/\
+    sed -n -e '/^#/d;/struct[ 	]*'$2'_struct[ 	]*{/,/};/p' < $3 | sed '/struct[ 	]*'$2'_struct[ 	]*{/d;/:[0-9]*[ 	]*;/d;/^[ 	]*$/d;/};/d;s/^[ 	]*//;s/volatile[ 	]*//;s/\(unsigned\|signed\|struct\)[ 	]*//;s/\(\[\|__attribute__\).*;[ 	]*$//;s/(\*//;s/)(.*)//;s/;[ 	]*$//;s/^[^ 	]*[ 	]*//;s/,/\
 /g' | sed 's/^[ 	*]*//;s/[ 	]*$//;s/^.*$/printf ("#define AOFF_'$2'_\0	0x%08x\\n", check_asm_data[i++]); printf("#define ASIZ_'$2'_\0	0x%08x\\n", check_asm_data[i++]);/' >> $4
     echo "printf (\"#define ASIZ_$2\\t0x%08x\\n\", check_asm_data[i++]);" >> $4
   ;;
   -data)
-    sed -n -e '/struct[ 	]*'$2'_struct[ 	]*{/,/};/p' < $3 | sed '/struct[ 	]*'$2'_struct[ 	]*{/d;/:[0-9]*[ 	]*;/d;/^[ 	]*$/d;/};/d;s/^[ 	]*//;s/volatile[ 	]*//;s/\(unsigned\|signed\|struct\)[ 	]*//;s/\(\[\|__attribute__\).*;[ 	]*$//;s/(\*//;s/)(.*)//;s/;[ 	]*$//;s/^[^ 	]*[ 	]*//;s/,/\
+    sed -n -e '/^#/d;/struct[ 	]*'$2'_struct[ 	]*{/,/};/p' < $3 | sed '/struct[ 	]*'$2'_struct[ 	]*{/d;/:[0-9]*[ 	]*;/d;/^[ 	]*$/d;/};/d;s/^[ 	]*//;s/volatile[ 	]*//;s/\(unsigned\|signed\|struct\)[ 	]*//;s/\(\[\|__attribute__\).*;[ 	]*$//;s/(\*//;s/)(.*)//;s/;[ 	]*$//;s/^[^ 	]*[ 	]*//;s/,/\
 /g' | sed 's/^[ 	*]*//;s/[ 	]*$//;s/^.*$/	((char *)\&((struct '$2'_struct *)0)->\0) - ((char *)((struct '$2'_struct *)0)),	sizeof(((struct '$2'_struct *)0)->\0),/' >> $4
     echo "	sizeof(struct $2_struct)," >> $4
   ;;

Index: devices.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel/devices.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- devices.c	14 Jan 2001 19:25:28 -0000	1.1.1.1
+++ devices.c	10 Jun 2003 01:46:16 -0000	1.2
@@ -4,9 +4,10 @@
  * Copyright (C) 1996 David S. Miller (da...@ca...)
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/threads.h>
-#include <linux/config.h>
+#include <linux/string.h>
 #include <linux/init.h>
 
 #include <asm/page.h>

Index: ebus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel/ebus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: init_task.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel/init_task.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- init_task.c	10 Apr 2002 15:17:42 -0000	1.2
+++ init_task.c	10 Jun 2003 01:46:16 -0000	1.3
@@ -14,6 +14,6 @@
  * If this is not aligned on a 8k boundry, then you should change code
  * in etrap.S which assumes it.
  */
-union task_union init_task_union
-	__attribute__((__section__(".text"))) =
+__asm__(".section \".text\",#alloc\n");
+union task_union init_task_union =
 		{ INIT_TASK(init_task_union.task) };

Index: pcic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel/pcic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcic.c	10 Apr 2002 15:17:42 -0000	1.2
+++ pcic.c	10 Jun 2003 01:46:16 -0000	1.3
@@ -759,7 +759,6 @@
 	unsigned long v;
 	int timer_irq, irq;
 
-	do_get_fast_time = pci_do_gettimeofday;
 	/* A hack until do_gettimeofday prototype is moved to arch specific headers
 	   and btfixupped. Patch do_gettimeofday with ba pci_do_gettimeofday; nop */
 	((unsigned int *)do_gettimeofday)[0] = 

Index: time.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel/time.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- time.c	10 Apr 2002 15:17:42 -0000	1.2
+++ time.c	10 Jun 2003 01:46:16 -0000	1.3
@@ -371,7 +371,6 @@
 	struct intersil *iregs;
 #endif
 
-	do_get_fast_time = do_gettimeofday;
 	BTFIXUPSET_CALL(bus_do_settimeofday, sbus_do_settimeofday, BTFIXUPCALL_NORM);
 	btfixup();
 

Index: unaligned.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/kernel/unaligned.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unaligned.c	10 Apr 2002 15:17:42 -0000	1.2
+++ unaligned.c	10 Jun 2003 01:46:16 -0000	1.3
@@ -224,7 +224,7 @@
 	"or	%%l1, %%g7, %%g7\n\t"						\
 	"st	%%g7, [%0 + 4]\n"						\
 "0:\n\n\t"									\
-	".section __ex_table\n\t"						\
+	".section __ex_table,#alloc\n\t"					\
 	".word	4b, " #errh "\n\t"						\
 	".word	5b, " #errh "\n\t"						\
 	".word	6b, " #errh "\n\t"						\
@@ -277,7 +277,7 @@
 "16:\t"	"stb	%%l2, [%0]\n"							\
 "17:\t"	"stb	%%l1, [%0 + 1]\n"						\
 "0:\n\n\t"									\
-	".section __ex_table\n\t"						\
+	".section __ex_table,#alloc\n\t"					\
 	".word	4b, " #errh "\n\t"						\
 	".word	5b, " #errh "\n\t"						\
 	".word	6b, " #errh "\n\t"						\