linux-vax-kern-commit — Notifications of CVS commits to kernel 2.4 source tree

[LV-kern-commit] CVS: kernel-2.4/include/asm-vax byteorder.h,1.4,1.5

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv5370/include/asm-vax

Modified Files:
	byteorder.h 
Log Message:
final fix for arch__swab32 hopfully.. make the g -> r for the input

fixes someone doing ntohl(p++) 

Thanks to Kenn for pointing this one out ...


Index: byteorder.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/byteorder.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- byteorder.h	2001/03/03 18:54:31	1.4
+++ byteorder.h	2001/03/03 20:39:47	1.5
@@ -4,7 +4,7 @@
 /* FIXME: arch byte swapping in assembly 
  */ 
 #include <asm/types.h>
-#define VAX_USE_ARCH_SWAB32 0
+#define VAX_USE_ARCH_SWAB32 1
 
 #ifdef __GNUC__
 /* 
@@ -21,7 +21,7 @@
                "rotl $-8, %1, r1\n\t"        /* r1 = ddaabbcc */
                "bicl2 $0xff00ff, r1\n\t"     /* r1 = dd00bb00 */
                "bisl2 r1, %0\n\t"            /* %0 = ddccbbaa */ 
-               : "=g" (t1) : "g" (x) : "r1" ); 
+               : "=&g" (t1) : "r" (x) : "r1" ); 
      return t1;
 }
 #endif

[LV-kern-commit] CVS: kernel-2.4/include/asm-vax byteorder.h,1.3,1.4

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv24081/include/asm-vax

Modified Files:
	byteorder.h 
Log Message:
check in fixed swab32 algorithm.. inline is still wrong..

#define switch to turn VAX specific one on/off


Index: byteorder.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/byteorder.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- byteorder.h	2001/01/20 13:51:05	1.3
+++ byteorder.h	2001/03/03 18:54:31	1.4
@@ -4,25 +4,27 @@
 /* FIXME: arch byte swapping in assembly 
  */ 
 #include <asm/types.h>
+#define VAX_USE_ARCH_SWAB32 0
 
 #ifdef __GNUC__
 /* 
  * ragge has a 1 insn shorter sequence which will probably replace this one 
  * later, depending on the relative instruction costs. 
  */
+#if VAX_USE_ARCH_SWAB32
 static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
 {
   __u32 t1;                     /* assume input is aabbccdd in x*/
    
-       __asm__("rotl $8, %1, r1\n\t"         /* r1 = bbccddaa */ 
-               "bisl3 $0xff00ff, r1, %0\n\t" /* %0 = 00cc00aa */ 
+       __asm__ volatile ("rotl $8, %1, r1\n\t"         /* r1 = bbccddaa */ 
+               "bicl3 $0xff00ff00, r1, %0\n\t" /* %0 = 00cc00aa */ 
                "rotl $-8, %1, r1\n\t"        /* r1 = ddaabbcc */
                "bicl2 $0xff00ff, r1\n\t"     /* r1 = dd00bb00 */
                "bisl2 r1, %0\n\t"            /* %0 = ddccbbaa */ 
                : "=g" (t1) : "g" (x) : "r1" ); 
-     return t1; 
+     return t1;
 }
-
+#endif
 /* 
  * according to the resident expert, this is as fast as assembly 
  */
@@ -31,8 +33,9 @@
    register __u16 __x = (x);
    return (u_int16_t)(__x << 8 | __x >> 8);               
 }
-
+#if VAX_USE_ARCH_SWAB32
 #define __arch__swab32(x) ___arch__swab32(x)
+#endif
 #define __arch__swab16(x) ___arch__swab16(x)
 
 #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)

[LV-kern-commit] CVS: kernel-2.4/arch/vax/lib checksum.S,1.1,1.2

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

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30127

Modified Files:
	checksum.S 
Log Message:
Fixed error-producing apostrophe


Index: checksum.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/lib/checksum.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checksum.S	2001/03/03 02:18:22	1.1
+++ checksum.S	2001/03/03 13:27:49	1.2
@@ -59,7 +59,7 @@
 	bbc $1, r2, 2f   # Check is bit 1 , jump if clear
 	subl2 $2, r3     # Alignment uses up 2 bytes
 	bgequ 1f         # Jump if we have at least two bytes
-	addl2 $2, r3     # Deal with it if we haven't
+	addl2 $2, r3     # Deal with it if we have not already
 	jmp 6f
 1:
 	/* If here copy halfword, and checksum it, */

[LV-kern-commit] CVS: kernel-2.4/arch/vax/lib Makefile,1.7,1.8

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

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/lib
In directory usw-pr-cvs1:/tmp/cvs-serv25851

Modified Files:
	Makefile 
Log Message:
Use standard .S -> .o rule (as per Documentation/kbuild/makefiles.txt)


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/lib/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	2001/03/03 02:18:22	1.7
+++ Makefile	2001/03/03 13:01:55	1.8
@@ -7,11 +7,7 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(AFLAGS) -traditional -o $*.o $<
-
-.S.o:
-	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
+USE_STANDARD_AS_RULE := true
 
 all: libio.a
 

[LV-kern-commit] CVS: kernel-2.4/arch/vax/lib checksum.S,NONE,1.1 Makefile,1.6,1.7 checksum.c,1.1,NONE

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

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16746

Modified Files:
	Makefile 
Added Files:
	checksum.S 
Removed Files:
	checksum.c 
Log Message:
DA: My implementation of csum_partial.. seems to work ...removed checksum.c

no longer needed


--- NEW FILE ---
/* $Id: checksum.S,v 1.1 2001/03/03 02:18:22 airlied Exp $
 *
 * INET		An implementation of the TCP/IP protocol suite for the LINUX
 *		operating system.  INET is implemented using the  BSD Socket
 *		interface as the means of communication with the user level.
 *
 *		IP/TCP/UDP checksumming routines
 *
 * Authors:	Jorge Cwik, <jo...@la...>
 *		Arnt Gulbrandsen, <ag...@nv...>
 *		Tom May, <ft...@ne...>
 *              Pentium Pro/II routines:
 *              Alexander Kjeldaas <as...@gu...>
 *              Finn Arne Gangstad <fi...@gu...>
 *		Lots of code moved from tcp.c and ip.c; see those files
 *		for more names.
 *
 * Changes:     Ingo Molnar, converted csum_partial_copy() to 2.1 exception
 *			     handling.
 *		Andi Kleen,  add zeroing on error
 *                   converted to pure assembler
 *
 * SuperH version:  Copyright (C) 1999  Niibe Yutaka
 *
 *		This program is free software; you can redistribute it and/or
 *		modify it under the terms of the GNU General Public License
 *		as published by the Free Software Foundation; either version
 *		2 of the License, or (at your option) any later version.
 */

/* VAX Hackery - Copyright (C) 2001 Dave Airlie <ai...@li...>
	Thanks to ragge for giving me info on calling conventions */
	
#include <asm/errno.h>
#include <linux/linkage.h>

/*
 * computes a partial checksum, e.g. for TCP/UDP fragments
 */

/*	
 * unsigned int csum_partial(const unsigned char *buf, int len,
 *                           unsigned int sum);
 */

.text
ENTRY(csum_partial)
	.word 0x3e
	movl 4(ap), r2 /* r2 now has buf */
	movl 8(ap), r3 /* r3 has len */
	movl 12(ap), r0 /* r4 has sum */

	/* test stuff */
	# Check Alignment
	# Jump if it okay
	# Alignment uses up two bytes
	# Jump if we have two bytes
	# something < 2 deal with it
	bbc $1, r2, 2f   # Check is bit 1 , jump if clear
	subl2 $2, r3     # Alignment uses up 2 bytes
	bgequ 1f         # Jump if we have at least two bytes
	addl2 $2, r3     # Deal with it if we haven't
	jmp 6f
1:
	/* If here copy halfword, and checksum it, */
	addw2 (r2), r0   # Add the half double-word to r0
	adwc $0, r0      # Carry
	addl2 $2, r2     # move pointer on two bytes

2:     /* Get 32-bit word count and do 3 checksum on it */
	/* if 0 count jump over it */
#	divl3 $32, r3, r5
	ashl $-5, r3, r5
	beqlu 4f
3:	addl2 (r2), r0 # Checksum 32 bytes
	adwc 4(r2), r0
	adwc 8(r2), r0
	adwc 12(r2), r0
	adwc 16(r2), r0
	adwc 20(r2), r0
	adwc 24(r2), r0
	adwc 28(r2), r0
	adwc $0, r0
	addl2 $32, r2
	sobgtr r5,3b
	/* jump not equal back to 3b*/
4:	bicl3 $0xFFFFFFE3, r3, r5 /* D.A. My method for an AND, AND r3 with 0x1C (00011100) */
	/* this put in r5 a value of 4, 8, 12, 16, 20, 24, 28 bytes */
	beqlu 6f
	/* rotate r5 by -2 gives 1, 2, 3, 4, 5, 6, 7 */
	rotl $-2, r5, r5          
5:	addl2 (r2), r0            /* Add in long from R2 */
	adwc $0, r0               /* Add in carry */
	addl2 $4, r2              /* move r2 pointer along 4 bytes */
	sobgtr r5, 5b             /* jump to 5:	if r5 is > 0 */
6:	bicl3 $0xFFFFFFFC, r3, r5 /* AND either 1 or 2 into r5 */
	beqlu 9f                  /* if no further bytes we are finished */
	cmpl $2, r5               /* compare what we have left with 2 */
	blssu 7f                  /* if 2 or greater go to 7f */
	movw (r2), r3             /* move a word into r3 */
	addl2 $2, r2              /* move r2 on two bytes */
	cmpl $2, r5
	beqlu 8f                  /* if what are we checking here?? */
	rotl $16, r3, r3          /* rotate r3 by a half word. */
	bicl2 $0xFFFF, r3         /* AND off bottom half */
7:	addb2 (r2), r3		  /* ADD Byte from R2 to R3 */
8:	addl2 r3, r0              /* Add Long R3 */
	adwc $0, r0               /* Add in any carry */
9:	ret
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/lib/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	2001/02/25 00:37:31	1.6
+++ Makefile	2001/03/03 02:18:22	1.7
@@ -7,6 +7,12 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
+.S.s:
+	$(CPP) $(AFLAGS) -traditional -o $*.o $<
+
+.S.o:
+	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
+
 all: libio.a
 
 L_TARGET := libio.a

--- checksum.c DELETED ---

[LV-kern-commit] CVS: kernel-2.4/include/asm-vax checksum.h,1.4,1.5

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv16637

Modified Files:
	checksum.h 
Log Message:
DA: check sum routine header file .. will clean up later on I promise


Index: checksum.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/checksum.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- checksum.h	2001/02/25 00:09:22	1.4
+++ checksum.h	2001/03/03 02:17:47	1.5
@@ -41,12 +41,6 @@
  {
         checksum_ADDL;
         checksum_ADDC;
-	/* This printk is required for some reason to make w get updated 
-	 *  for the next loop iteration.... no idea why.. tried a couple
-	 *  of things like adding a varible but they seem to get optimsed
-         *  out ... - D.A. 3 Dec 2000 
-	 */
-	//	printk("w: %8X, sum: %8X, i: %i\n", *(unsigned int *)w, sum, i);
  }
    
  __asm__("addl2 %1, %0\n"
@@ -110,7 +104,7 @@
 csum_partial_copy(const char *src, char *dst, int len,unsigned int sum)
 {
 	memcpy(dst,src,len);
-        return csum_partial_inline(dst, len, sum);
+        return csum_partial(dst, len, sum);
 }
 
 /*
@@ -136,7 +130,7 @@
 csum_partial_copy_nocheck (const char *src, char *dst, int len, unsigned int sum)
 {
         memcpy(dst,src,len);
-        return csum_partial_inline(dst, len, sum);
+        return csum_partial(dst, len, sum);
 }
 
 
@@ -146,7 +140,7 @@
 
 extern inline unsigned short csum_fold(unsigned int sum)
 {
-	sum = (sum & 0xffff) + (sum >> 16);
+  	sum = (sum & 0xffff) + (sum >> 16);
 	sum = (sum & 0xffff) + (sum >> 16);
 	return ~sum;
 }

[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel process.c,1.5,1.6

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

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

Modified Files:
	process.c 
Log Message:
dump FPU filler function .. one less bad linker error


Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/process.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- process.c	2001/02/21 00:19:05	1.5
+++ process.c	2001/02/27 22:36:52	1.6
@@ -21,6 +21,8 @@
 
 #include <asm/unistd.h>
 
+#include <asm/elf.h>
+
 void cpu_idle(void)
 {
 	/* endless idle loop with no priority at all */
@@ -233,4 +235,10 @@
         putname(tmpname);
 out:
         return error;
+}
+
+int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
+{
+  /* no FPU support .. YET - D.A. 25 Feb 2001 */
+  return 0;
 }

[LV-kern-commit] CVS: kernel-2.4/include/asm-vax hardirq.h,1.3,1.4

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv27444/include/asm-vax

Modified Files:
	hardirq.h 
Log Message:
make our hardirq look like everyone elses...


Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/hardirq.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hardirq.h	2001/02/22 23:53:36	1.3
+++ hardirq.h	2001/02/27 22:35:10	1.4
@@ -4,6 +4,7 @@
 /* FIXME: copied from arm port (or any except i386/alpha ) */
 /* stubs for irq scb code */
 
+#include <linux/config.h>
 #include <linux/threads.h>
 
 typedef struct {
@@ -16,18 +17,16 @@
 
 #include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
 
-
-
-/*extern unsigned int local_irq_count[NR_CPUS];*/
-
 /*
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?
  */
-#define in_interrupt() (local_irq_count(smp_processor_id()) + local_bh_count(smp_processor_id()) != 0)
+#define in_interrupt() ({ const int __cpu = smp_processor_id(); \
+	(local_irq_count(__cpu) + local_bh_count(__cpu) != 0); })
+
 #define in_irq() (local_irq_count(smp_processor_id()) != 0)
 
-#ifndef __SMP__
+#ifndef CONFIG_SMP
 
 #define hardirq_trylock(cpu)	(local_irq_count(cpu) == 0)
 #define hardirq_endlock(cpu)	do { } while (0)
@@ -35,10 +34,10 @@
 #define irq_enter(cpu)	(local_irq_count(cpu)++)
 #define irq_exit(cpu)	(local_irq_count(cpu)--)
 
-#define synchronize_irq()	do { } while (0)
+#define synchronize_irq()	barrier();
 
 #else
-#error SMP not supported
-#endif /* __SMP__ */
+#error Nil aon SMP agam
+#endif /* CONFIG_SMP */
 
 #endif /* _ASM_VAX_HARDIRQ_H */

[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxlance.c,1.7,1.8

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

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv22161/drivers/net

Modified Files:
	vaxlance.c 
Log Message:
remove malloc.h unneeded


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vaxlance.c	2001/02/26 18:11:26	1.7
+++ vaxlance.c	2001/02/27 22:05:26	1.8
@@ -40,7 +40,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/malloc.h>
 #include <linux/user.h>
 #include <linux/utsname.h>
 #include <linux/a.out.h>

[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxlance.c,1.6,1.7

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

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv25606/drivers/net

Modified Files:
	vaxlance.c 
Log Message:
bring up 2.4.2 level


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vaxlance.c	2001/02/22 23:24:29	1.6
+++ vaxlance.c	2001/02/26 18:11:26	1.7
@@ -39,6 +39,7 @@
 #include <linux/string.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
+#include <linux/slab.h>
 #include <linux/malloc.h>
 #include <linux/user.h>
 #include <linux/utsname.h>
@@ -485,6 +486,7 @@
 					 len);
 			skb->protocol = eth_type_trans(skb, dev);
 			netif_rx(skb);
+			dev->last_rx=jiffies;
 			lp->stats.rx_packets++;
 		}
 
@@ -1051,20 +1053,21 @@
 	  #endif
 	*/
 #endif
-	/*
+
+#if 0
+	  vsbus_enable_int(lp->vsbus_int);
 	  writereg(&ll->rap, LE_CSR0);
 	  writereg(&ll->rdp, LE_C0_STOP);
 	  lp->busmaster_regval=0;
 	  lance_init_ring(dev);
 	  
-	  dev->tbusy = 0;
-	  dev->interrupt = 0;
-	  dev->start = 1;
+	  netif_start_queue(dev);
 	  load_csrs(lp);
 	  init_restart_lance(lp);
-	*/
+
 	/* I'll try fecking something out from the card here soon - D.A. */
-	/*       	vax_lance_test_xmit(dev);*/
+	    	vax_lance_test_xmit(dev);
+#endif
 	return 0;
 
 err_out:
@@ -1119,7 +1122,7 @@
 unsigned char tx_block[30];
 
 #if 0
-static int vax_lance_test_xmit(struct device *dev)
+static int vax_lance_test_xmit(struct net_device *dev)
 {
   struct lance_private *lp = (struct lance_private *) dev->priv;
   volatile struct lance_regs *ll = lp->ll;
@@ -1139,11 +1142,6 @@
   skblen = 16;
   save_flags(flags);
   cli();
-  if (!TX_BUFFS_AVAIL) {
-    restore_flags(flags);
-    printk("Return TX_BUF_AVAIL\n");
-    return -1;
-  }
   len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen;
   
   lp->stats.tx_bytes += len;
@@ -1162,8 +1160,8 @@
   writereg(&ll->rdp, LE_C0_INEA | LE_C0_TDMD);
   dev->trans_start = jiffies;
   
-  if (TX_BUFFS_AVAIL)
-    dev->tbusy = 0;
+  if (TX_BUFFS_AVAIL<=0)
+	netif_stop_queue(dev);
   
   restore_flags(flags);
   return status;

[LV-kern-commit] CVS: kernel-2.4/drivers/vsbus vsbus.c,1.2,1.3

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

Update of /cvsroot/linux-vax/kernel-2.4/drivers/vsbus
In directory usw-pr-cvs1:/tmp/cvs-serv13040

Modified Files:
	vsbus.c 
Log Message:
hopefully make Kenn's Ethernet work..


Index: vsbus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/vsbus/vsbus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vsbus.c	2001/02/22 23:52:21	1.2
+++ vsbus.c	2001/02/26 11:31:35	1.3
@@ -20,13 +20,13 @@
   sys_vs.vs_cpu_ptr=(void *)ioremap(VSA_BASE_REGS, 128);
   
   sys_vs.vs_cpu_ptr->vc_intclr=0xFF;
-   
+  sys_vs.vs_cpu_ptr->vc_intmsk=0;
   return 0;
 }
 
 int vsbus_enable_int(int bit_nr)
 {
-  sys_vs.vs_cpu_ptr->vc_intmsk=1<<bit_nr;
+  sys_vs.vs_cpu_ptr->vc_intmsk|=1<<bit_nr;
 
   return 0;
 }

[LV-kern-commit] CVS: kernel-2.4/include/asm-vax unistd.h,1.3,1.4

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv11186

Modified Files:
	unistd.h 
Log Message:
Merge Linus' 2.4.2 tree


Index: unistd.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/unistd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unistd.h	2001/02/05 00:02:43	1.3
+++ unistd.h	2001/02/26 02:43:55	1.4
@@ -454,7 +454,6 @@
 	return sys_sync();
 }
 
-extern int sys_wait4(int, int *, int, struct rusage *);
 static inline pid_t waitpid(int pid, int * wait_stat, int flags)
 {
 	return sys_wait4(pid, wait_stat, flags, NULL);

[LV-kern-commit] CVS: kernel-2.4/mm slab.c,1.3,1.4

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

Update of /cvsroot/linux-vax/kernel-2.4/mm
In directory usw-pr-cvs1:/tmp/cvs-serv9637/mm

Modified Files:
	slab.c 
Log Message:
Merge Linus' official 2.4.2 tree


Index: slab.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/mm/slab.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- slab.c	2001/02/21 00:29:05	1.3
+++ slab.c	2001/02/26 02:28:27	1.4
@@ -1699,7 +1699,7 @@
  * kmem_cache_reap - Reclaim memory from caches.
  * @gfp_mask: the type of memory required.
  *
- * Called from try_to_free_page().
+ * Called from do_try_to_free_pages() and __alloc_pages()
  */
 void kmem_cache_reap (int gfp_mask)
 {

[LV-kern-commit] CVS: kernel-2.4/include/linux elf.h,1.2,1.3

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

Update of /cvsroot/linux-vax/kernel-2.4/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv9637/include/linux

Modified Files:
	elf.h 
Log Message:
Merge Linus' official 2.4.2 tree


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/elf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elf.h	2001/01/23 16:54:24	1.2
+++ elf.h	2001/02/26 02:28:27	1.3
@@ -76,6 +76,8 @@
 
 #define EM_VAX		75      /* Digital Equipment Corp VAX - used to be 780 */
 
+#define EM_CRIS         76      /* Axis Communications 32-bit embedded processor */
+
 /*
  * This is an interim value that we will use until the committee comes
  * up with a final number.

[LV-kern-commit] CVS: kernel-2.4/kernel context.c,1.2,1.3

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

Update of /cvsroot/linux-vax/kernel-2.4/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv9637/kernel

Modified Files:
	context.c 
Log Message:
Merge Linus' official 2.4.2 tree


Index: context.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/kernel/context.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- context.c	2001/02/21 00:31:23	1.2
+++ context.c	2001/02/26 02:28:27	1.3
@@ -152,7 +152,7 @@
 int start_context_thread(void)
 {
 	DECLARE_MUTEX_LOCKED(sem);
-	kernel_thread(context_thread, &sem, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
+	kernel_thread(context_thread, &sem, CLONE_FS | CLONE_FILES);
 	down(&sem);
 	return 0;
 }

[LV-kern-commit] CVS: kernel-2.4/drivers/net Makefile,1.2,1.3 Space.c,1.2,1.3

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

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv9637/drivers/net

Modified Files:
	Makefile Space.c 
Log Message:
Merge Linus' official 2.4.2 tree


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	2001/02/11 19:05:20	1.2
+++ Makefile	2001/02/26 02:28:27	1.3
@@ -26,7 +26,7 @@
   obj-$(CONFIG_ISDN) += slhc.o
 endif
 
-subdir-$(CONFIG_PCMCIA) += pcmcia
+subdir-$(CONFIG_NET_PCMCIA) += pcmcia
 subdir-$(CONFIG_TULIP) += tulip
 subdir-$(CONFIG_IRDA) += irda
 subdir-$(CONFIG_TR) += tokenring

Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/Space.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Space.c	2001/01/17 16:00:11	1.2
+++ Space.c	2001/02/26 02:28:27	1.3
@@ -171,7 +171,7 @@
  * drivers that probe for EISA cards (in the ISA group).  These are the
  * EISA only driver probes, and also the legacy PCI probes
  */
-struct devprobe eisa_probes[] __initdata = {
+static struct devprobe eisa_probes[] __initdata = {
 #ifdef CONFIG_DE4X5             /* DEC DE425, DE434, DE435 adapters */
 	{de4x5_probe, 0},
 #endif
@@ -194,7 +194,7 @@
 };
 
 
-struct devprobe mca_probes[] __initdata = {
+static struct devprobe mca_probes[] __initdata = {
 #ifdef CONFIG_ULTRAMCA 
 	{ultramca_probe, 0},
 #endif
@@ -217,7 +217,7 @@
  * ISA probes that touch addresses < 0x400 (including those that also
  * look for EISA/PCI/MCA cards in addition to ISA cards).
  */
-struct devprobe isa_probes[] __initdata = {
+static struct devprobe isa_probes[] __initdata = {
 #ifdef CONFIG_EL3		/* ISA, EISA, MCA 3c5x9 */
 	{el3_probe, 0},
 #endif
@@ -320,7 +320,7 @@
 	{NULL, 0},
 };
 
-struct devprobe parport_probes[] __initdata = {
+static struct devprobe parport_probes[] __initdata = {
 #ifdef CONFIG_DE600		/* D-Link DE-600 adapter */
 	{de600_probe, 0},
 #endif
@@ -330,7 +330,7 @@
 	{NULL, 0},
 };
 
-struct devprobe m68k_probes[] __initdata = {
+static struct devprobe m68k_probes[] __initdata = {
 #ifdef CONFIG_ATARILANCE	/* Lance-based Atari ethernet boards */
 	{atarilance_probe, 0},
 #endif
@@ -368,14 +368,14 @@
 };
 
 
-struct devprobe sgi_probes[] __initdata = {
+static struct devprobe sgi_probes[] __initdata = {
 #ifdef CONFIG_SGISEEQ
 	{sgiseeq_probe, 0},
 #endif
 	{NULL, 0},
 };
 
-struct devprobe mips_probes[] __initdata = {
+static struct devprobe mips_probes[] __initdata = {
 #ifdef CONFIG_MIPS_JAZZ_SONIC
 	{sonic_probe, 0},
 #endif
@@ -650,47 +650,6 @@
 #define	NEXT_DEV	(&sbni0_dev)
 #endif 
 	
-/* S/390 channels */
-#ifdef CONFIG_CTC
-    extern int ctc_probe(struct net_device *dev);
-    static struct net_device ctc7_dev =
-       {"ctc7", 0, 0, 0, 0, 0, 0, 0, 0, 0, NEXT_DEV,  ctc_probe};
-    static struct net_device ctc6_dev =
-       {"ctc6", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc7_dev, ctc_probe};
-    static struct net_device ctc5_dev =
-       {"ctc5", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc6_dev, ctc_probe};
-    static struct net_device ctc4_dev =
-       {"ctc4", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc5_dev, ctc_probe};
-    static struct net_device ctc3_dev =
-       {"ctc3", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc4_dev, ctc_probe};
-    static struct net_device ctc2_dev =
-       {"ctc2", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc3_dev, ctc_probe};
-    static struct net_device ctc1_dev =
-       {"ctc1", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc2_dev, ctc_probe};
-    static struct net_device ctc0_dev =
-       {"ctc0", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc1_dev, ctc_probe}; 
-
-    static struct net_device escon7_dev =
-       {"escon7", 0, 0, 0, 0, 0, 0, 0, 0, 0, &ctc0_dev,   ctc_probe};
-    static struct net_device escon6_dev =
-       {"escon6", 0, 0, 0, 0, 0, 0, 0, 0, 0, &escon7_dev, ctc_probe};
-    static struct net_device escon5_dev =
-       {"escon5", 0, 0, 0, 0, 0, 0, 0, 0, 0, &escon6_dev, ctc_probe};
-    static struct net_device escon4_dev =
-       {"escon4", 0, 0, 0, 0, 0, 0, 0, 0, 0, &escon5_dev, ctc_probe};
-    static struct net_device escon3_dev =
-       {"escon3", 0, 0, 0, 0, 0, 0, 0, 0, 0, &escon4_dev, ctc_probe};
-    static struct net_device escon2_dev =
-       {"escon2", 0, 0, 0, 0, 0, 0, 0, 0, 0, &escon3_dev, ctc_probe};
-    static struct net_device escon1_dev =
-       {"escon1", 0, 0, 0, 0, 0, 0, 0, 0, 0, &escon2_dev, ctc_probe};
-    static struct net_device escon0_dev =
-       {"escon0", 0, 0, 0, 0, 0, 0, 0, 0, 0, &escon1_dev, ctc_probe}; 
-
-#undef  NEXT_DEV
-#define NEXT_DEV        (&escon0_dev)                                  
-#endif  
-
 /*
  *	The loopback device is global so it can be directly referenced
  *	by the network code. Also, it must be first on device list.

[LV-kern-commit] CVS: kernel-2.4 Makefile,1.9,1.10

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

Update of /cvsroot/linux-vax/kernel-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv9637

Modified Files:
	Makefile 
Log Message:
Merge Linus' official 2.4.2 tree


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	2001/02/22 23:30:17	1.9
+++ Makefile	2001/02/26 02:28:26	1.10
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 0
-EXTRAVERSION = -20010221
+SUBLEVEL = 2
+EXTRAVERSION = -20010226
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
@@ -111,8 +111,7 @@
 export SVGA_MODE = -DSVGA_MODE=NORMAL_VGA
 
 #
-# if you want the RAM disk device, define this to be the
-# size in blocks.
+# If you want the RAM disk device, define this to be the size in blocks.
 # This is i386 specific.
 #
 
@@ -140,9 +139,9 @@
 DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
 DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
 DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
-DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.a
+DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
 DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
-DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnet.a
+DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
 DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
 DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
 DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
@@ -463,9 +462,8 @@
 
 depend dep: dep-files
 
-# make checkconfig: Prune 'scripts' directory to avoid "false positives".
 checkconfig:
-	find * -name '*.[hcS]' -type f -print | grep -v scripts/ | sort | xargs $(PERL) -w scripts/checkconfig.pl
+	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
 
 checkhelp:
 	find * -name [cC]onfig.in -print | sort | xargs $(PERL) -w scripts/checkhelp.pl

[LV-kern-commit] CVS: kernel-2.4/drivers/char dz.c,1.3,1.4 tty_io.c,1.3,1.4

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

Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv9637/drivers/char

Modified Files:
	dz.c tty_io.c 
Log Message:
Merge Linus' official 2.4.2 tree


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dz.c	2001/01/26 00:27:00	1.3
+++ dz.c	2001/02/26 02:28:27	1.4
@@ -33,7 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h> 
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/major.h>
 #include <linux/param.h>

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/tty_io.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tty_io.c	2001/02/21 00:21:40	1.3
+++ tty_io.c	2001/02/26 02:28:27	1.4
@@ -81,7 +81,7 @@
 #include <linux/kd.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
@@ -139,7 +139,6 @@
 int tty_ioctl(struct inode * inode, struct file * file,
 	      unsigned int cmd, unsigned long arg);
 static int tty_fasync(int fd, struct file * filp, int on);
-extern int sx_init (void);
 extern int vme_scc_init (void);
 extern long vme_scc_console_init(void);
 extern int serial167_init(void);

[LV-kern-commit] CVS: kernel-2.4/arch/vax/lib lshrdi3.c,NONE,1.1 Makefile,1.5,1.6

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

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27610

Modified Files:
	Makefile 
Added Files:
	lshrdi3.c 
Log Message:
lshrdi3 stolen from gcc libgcc2 


--- NEW FILE ---
/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.

This file is part of GNU CC.

GNU CC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.

GNU CC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with GNU CC; see the file COPYING.  If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.  */

#define BITS_PER_UNIT 8

typedef 	 int SItype	__attribute__ ((mode (SI)));
typedef unsigned int USItype	__attribute__ ((mode (SI)));
typedef		 int DItype	__attribute__ ((mode (DI)));
typedef int word_type __attribute__ ((mode (__word__)));

struct DIstruct {SItype high, low;};

typedef union
{
  struct DIstruct s;
  DItype ll;
} DIunion;


DItype
__lshrdi3 (DItype u, word_type b)
{
  DIunion w;
  word_type bm;
  DIunion uu;
  
  if (b == 0)
    return u;
  
  uu.ll = u;
  
  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
  if (bm <= 0)
    {
      w.s.high = 0;
      w.s.low = (USItype)uu.s.high >> -bm;
    }
  else
    {
      USItype carries = (USItype)uu.s.high << bm;
      w.s.high = (USItype)uu.s.high >> b;
      w.s.low = ((USItype)uu.s.low >> b) | carries;
    }
  
  return w.ll;
}

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/lib/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	2001/02/18 20:37:39	1.5
+++ Makefile	2001/02/25 00:37:31	1.6
@@ -10,7 +10,7 @@
 all: libio.a
 
 L_TARGET := libio.a
-obj-y   := string.o string_user.o console.o negdi.o checksum.o
+obj-y   := string.o string_user.o console.o negdi.o checksum.o lshrdi3.o
 
 include $(TOPDIR)/Rules.make
 

[LV-kern-commit] CVS: kernel-2.4/include/asm-vax checksum.h,1.3,1.4

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv24183/include/asm-vax

Modified Files:
	checksum.h 
Log Message:
added tcpudp_magic and tcpudp_nofold not verified .. will verify later


Index: checksum.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/checksum.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- checksum.h	2001/02/22 23:25:08	1.3
+++ checksum.h	2001/02/25 00:09:22	1.4
@@ -62,17 +62,17 @@
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented
  */
-      
-extern unsigned short int csum_tcpudp_magic(unsigned long saddr,
-					   unsigned long daddr,
-					   unsigned short len,
-					   unsigned short proto,
-					   unsigned int sum);
-
-unsigned int csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
-				unsigned short len, unsigned short proto,
-				unsigned int sum);
-
+/*
+  extern unsigned short int csum_tcpudp_magic(unsigned long saddr,
+  unsigned long daddr,
+  unsigned short len,
+  unsigned short proto,
+  unsigned int sum);
+  
+  unsigned int csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
+  unsigned short len, unsigned short proto,
+  unsigned int sum)
+*/
 	
 /*
  * computes the checksum of a memory block at buff, length len,
@@ -149,6 +149,43 @@
 	sum = (sum & 0xffff) + (sum >> 16);
 	sum = (sum & 0xffff) + (sum >> 16);
 	return ~sum;
+}
+
+
+/*
+ * computes the checksum of the TCP/UDP pseudo-header
+ * returns a 16-bit checksum, already complemented
+ */
+static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
+                                               unsigned long daddr,
+                                               unsigned short len,
+                                               unsigned short proto,
+                                               unsigned int sum)
+{
+	  
+  /*  in X86 this is  addl %1, %0
+                      adcl %2, %0
+                      adcl %3, %0
+             	      adcl $0, %0 */
+
+  __asm__("addl2 %1, %0\n"
+          "adwc %2, %0\n"
+          "adwc %3, %0\n"
+	  "adwc $0, %0\n"
+	  : "=r" (sum) : "g" (daddr), "g" (saddr), "g"((ntohs(len)<<16)+proto*256), "0" (sum));
+  return sum;
+}
+/*
+ * computes the checksum of the TCP/UDP pseudo-header
+ * returns a 16-bit checksum, already complemented
+ */
+static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
+						   unsigned long daddr,
+						   unsigned short len,
+						   unsigned short proto,
+						   unsigned int sum)
+{
+	return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
 
 /*

[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel interrupt.c,1.9,1.10

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

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

Modified Files:
	interrupt.c 
Log Message:
added a get_irq_list function.. v. primitive ... need to add kernel stats
stuff


Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- interrupt.c	2001/02/22 23:55:27	1.9
+++ interrupt.c	2001/02/24 23:50:57	1.10
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/string.h>
+#include <linux/kernel_stat.h>
 
 #include <asm/pgalloc.h>
 #include <asm/scb.h>
@@ -615,3 +616,27 @@
         return retval;
 }
 
+int get_irq_list(char *buf)
+{
+  int i, len=0;
+  struct irqvector *vector;
+  unsigned char *inside_vec;
+
+  for (i=0; i<NR_IRQS; i++)
+    {
+      if (!scb_vec_free(i))
+	{
+	  inside_vec = SCB_VECTOR(i);
+	  
+	  /* We must mask off the bottom two bits.  They have meaning to
+	     to the hardware, and are not part of the actual target address */
+
+	  inside_vec = (unsigned char *) ((unsigned long)(inside_vec) & ~0x3);
+	  
+	  vector = (struct irqvector *)(inside_vec - 
+					offsetof(struct irqvector, inst_jsb));
+	  len += sprintf(buf+len, "%4d: %8d %s\n", vector->vec_num, 0, vector->action.name);
+	}
+    }
+  return len;
+}

[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxlance.c,1.5,1.6

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

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv11859/drivers/net

Modified Files:
	vaxlance.c 
Log Message:
forgot a spin_lock_irq .. but back some proper device init code I'd removed


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vaxlance.c	2001/02/22 22:49:22	1.5
+++ vaxlance.c	2001/02/22 23:24:29	1.6
@@ -317,7 +317,9 @@
 
 	ib = (struct lance_init_block *) (dev->mem_start);
 	lp->init_block=ib;
+
 	/* Lock out other processes while setting up hardware */
+
 	netif_stop_queue(dev);
 	lp->rx_new = lp->tx_new = 0;
 	lp->rx_old = lp->tx_old = 0;
@@ -723,7 +725,7 @@
 
 	printk(KERN_ERR "%s: transmit timed out, status %04x, reset\n",
 			       dev->name, ll->rdp);
-			lance_reset(dev);
+	lance_reset(dev);
 	netif_wake_queue(dev);
 }
 
@@ -738,6 +740,8 @@
 
 	len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen;
 
+	spin_lock_irq(&lp->lock);
+
 	lp->stats.tx_bytes += len;
 	
 	entry = lp->tx_new & TX_RING_MOD_MASK;
@@ -887,7 +891,7 @@
 	esar_base=ioremap(esar_phys_addr, 0x80);
 	if (vax_lance_debug && version_printed++ == 0)
 	  printk(version);
-#if 0
+#if 1
 	if (dev == NULL) {
 		dev = init_etherdev(0, sizeof(struct lance_private) + 8);
 	} else {

[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel interrupt.c,1.7,1.8

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

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

Modified Files:
	interrupt.c 
Log Message:
setting/unsetting of autoprobing missing


Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- interrupt.c	2001/02/16 00:54:26	1.7
+++ interrupt.c	2001/02/22 22:21:31	1.8
@@ -539,7 +539,7 @@
 	for (i=FIRST_ADAPTER_VECTOR; i<NR_IRQS; i++) {
 		stray_handlers[i].flags &= ~STRAY_EXCEPTION_FIRED;
 	}
-
+	autoprobing=1;
 	restore_flags(flags);	
 
 	return 1;
@@ -563,7 +563,7 @@
 			nr_vecs++;
 		}
 	}
-
+	autoprobing=0;
 	restore_flags(flags);	
 
 	if (nr_vecs > 1) {

[LV-kern-commit] CVS: kernel-2.4/drivers Makefile,1.2,1.3

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

Update of /cvsroot/linux-vax/kernel-2.4/drivers
In directory usw-pr-cvs1:/tmp/cvs-serv1911/drivers

Modified Files:
	Makefile 
Log Message:
start to get rid os VSABUS .. called it VSBUS from here on in

this make break some ppl's configs


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	2001/01/26 00:27:00	1.2
+++ Makefile	2001/02/22 22:15:07	1.3
@@ -37,7 +37,7 @@
 subdir-$(CONFIG_ISDN)		+= isdn
 subdir-$(CONFIG_ATM)		+= atm
 subdir-$(CONFIG_FC4)		+= fc4
-subdir-$(CONFIG_VSABUS)		+= vsbus
+subdir-$(CONFIG_VSBUS)		+= vsbus
 
 # CONFIG_HAMRADIO can be set without CONFIG_NETDEVICE being set  -- ch
 subdir-$(CONFIG_HAMRADIO)	+= net/hamradio

[LV-kern-commit] CVS: kernel-2.4 Makefile,1.8,1.9

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

Update of /cvsroot/linux-vax/kernel-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv12598

Modified Files:
	Makefile 
Log Message:
Fix CROSS_COMPILE prefix

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile	2001/02/22 22:15:07	1.8
+++ Makefile	2001/02/22 23:30:17	1.9
@@ -19,7 +19,7 @@
 HOSTCC  	= gcc
 HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 
-CROSS_COMPILE 	= /usr/local/vax-tools/bin/vax-dec-linux-
+CROSS_COMPILE 	= /usr/local/bin/vax-dec-linux-
 
 #
 # Include the make variables (CC, etc...)