[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel cpu_ka410.c,1.5,1.6 cpu_ka42.c,1.5,1.6 cpu_ka43.c,1.6,1.7 cpu_ka46.c,1.6,1.7 cpu_ka55.c,1.5,1.6 cpu_vxt.c,1.6,1.7 process.c,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv31851/arch/vax/kernel

Modified Files:
	cpu_ka410.c cpu_ka42.c cpu_ka43.c cpu_ka46.c cpu_ka55.c 
	cpu_vxt.c process.c 
Log Message:
Merge with Linus' 2.5.2 release


Index: cpu_ka410.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka410.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka410.c	20 May 2002 01:09:49 -0000	1.5
+++ cpu_ka410.c	5 Jun 2002 21:55:03 -0000	1.6
@@ -60,9 +60,11 @@
 
 void ka410_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A000, 3);
 
    dz_serial_console_init(0,0);
+#endif
 }
 
 const char *ka410_cpu_type_str(void)

Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka42.c	20 May 2002 01:09:49 -0000	1.5
+++ cpu_ka42.c	5 Jun 2002 21:55:03 -0000	1.6
@@ -71,9 +71,11 @@
 #define KA42_CADR_DSE 0x10
    __mtpr(KA42_CADR_S2E|KA42_CADR_S1E|KA42_CADR_ISE|KA42_CADR_DSE, PR_CADR);
 
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A0000, 3);
 
    dz_serial_console_init(0, 0);
+#endif
 }
 
 void ka42_init_devices(void)

Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpu_ka43.c	31 May 2002 01:58:38 -0000	1.6
+++ cpu_ka43.c	5 Jun 2002 21:55:03 -0000	1.7
@@ -95,9 +95,11 @@
 /* dont call ka43_cache_reset before this function (unlikely) */
 void ka43_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A0000, 3);
 
    dz_serial_console_init(0, 0);
+#endif
 
    cpu_regs = ioremap(KA43_CPU_BASE, KA43_CPU_SIZE);
    ka43_creg_addr = ioremap(KA43_CH2_CREG, 1);

Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpu_ka46.c	27 May 2002 19:59:03 -0000	1.6
+++ cpu_ka46.c	5 Jun 2002 21:55:03 -0000	1.7
@@ -83,8 +83,10 @@
 
 void ka46_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A0000, 3);
    dz_serial_console_init(0, 0);
+#endif
 }
 
 const char *ka46_cpu_type_str(void)

Index: cpu_ka55.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka55.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka55.c	20 May 2002 01:09:49 -0000	1.5
+++ cpu_ka55.c	5 Jun 2002 21:55:03 -0000	1.6
@@ -91,9 +91,11 @@
 
 void ka55_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x25000000, 3);
 
    dz_serial_console_init(0, 0);
+#endif
 }
 
 const char *ka55_cpu_type_str(void)

Index: cpu_vxt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_vxt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpu_vxt.c	20 May 2002 09:32:33 -0000	1.6
+++ cpu_vxt.c	5 Jun 2002 21:55:03 -0000	1.7
@@ -9,6 +9,8 @@
  *  may 2002. It looks as if the 20040058 address is right for prom output.
  */
 
+/* FIXME: recent VXT work in 2.4 needs to be pulled over */
+
 #include <linux/types.h>   /* For NULL */
 #include <linux/kernel.h>  /* For printk */
 
@@ -63,9 +65,10 @@
 
 void vxt_post_vm_init(void)
 {
-   
+#ifdef CONFIG_DZ   
    init_dz11_console(0x200A0000, 3);
    dz_serial_console_init(0, 0);
+#endif
 }
 
 

Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- process.c	20 May 2002 00:33:33 -0000	1.4
+++ process.c	5 Jun 2002 21:55:03 -0000	1.5
@@ -29,8 +29,7 @@
 void cpu_idle(void)
 {
 	/* endless idle loop with no priority at all */
-	current->nice = 20;
-	current->counter = -100;
+	current->__nice = 20;
 
 	while(1) {
 		/* Although we are an idle CPU, we do not want to