Import 1.3.49

CREDITS

@@ -483,6 +483,14 @@ S: Hoefbladhof 27
 S: 2215 DV Voorhout
 S: The Netherlands
 
+N: Karl Keyte
+E: kkeyte@koft.rhein-main.de
+E: kkeyte@esoc.esa.de
+D: Disk usage statistics and modifications to line printer driver
+S: Erbacher Strasse 6
+S: D-64283 Darmstadt
+S: Germany
+
 N: Olaf Kirch
 E: okir@monad.swb.de
 D: Author of the Linux Network Administrators' Guide

Makefile

 VERSION = 1
 PATCHLEVEL = 3
-SUBLEVEL = 48
+SUBLEVEL = 49
 
 ARCH = i386
 

arch/i386/kernel/setup.c

@@ -175,7 +175,7 @@ void setup_arch(char **cmdline_p,
 static const char * i486model(unsigned int nr)
 {
 	static const char *model[] = {
-		"0", "DX","SX","DX/2","4","SX/2","6","DX/2-WB","DX/4"
+		"0", "DX","SX","DX/2","4","SX/2","6","DX/2-WB","DX/4","DX/4-WB"
 	};
 	if (nr < sizeof(model)/sizeof(char *))
 		return model[nr];

arch/i386/kernel/smp.c

@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <asm/i82489.h>
 #include <linux/smp.h>
+#include <asm/pgtable.h>
 #include <asm/bitops.h>
 #include <asm/smp.h>
 

drivers/char/README.scc

-// 950913: note -- I will upload the new version 1.9a to ftp.ucsd.edu
-//         as soon as possible... 
-//
-// ******
-// ****** The driver has a  n e w  MAJOR number (34) now! ******
-// ******
-//
-// please remake /dev/sc*:
-//
-// mknod /dev/scc0 c 34 0
-// mknod /dev/scc1 c 34 1
-// mknod /dev/scc2 c 34 2
-// mknod /dev/scc3 c 34 3
-//
-// (and so on...)
-//
-// If you want to use the old device naming scheme use:
-//
-// ln -f /dev/scc0 /dev/sc1
-// ln -f /dev/scc1 /dev/sc2
-// ln -f /dev/scc2 /dev/sc3
-// ln -f /dev/scc3 /dev/sc4
-//
-// (you get the idea...)
-//
-// -dl1bke-
-
 
 You will find subset of the documentation in
 
@@ -33,11 +6,11 @@ You will find subset of the documentation in
 
 To use this driver you MUST have the full package from
 
-ftp.ucsd.edu:/hamradio/packet/tcpip/incoming/z8530drv-1.9a.dl1bke.tar.gz
+ftp.ucsd.edu:/hamradio/packet/tcpip/incoming/z8530drv-2.01.dl1bke.real.tar.gz
 
 [
   if you can't find it there, try:
-  .../tcpip/linux/z8530drv-1.9a.dl1bke.tar.gz
+  .../tcpip/linux/z8530drv-2.01.dl1bke.tar.gz
 
 ]
 

drivers/char/scc_config.h

-#include <linux/scc.h>
-
-/********* CONFIGURATION PARAMATERES; PLEASE CHANGE THIS TO YOUR OWN SITUATION **********/
-
-/* SCC hardware parameters */
-
-/* use the following board types: 
- *
- *	PA0HZP		OptoSCC (PA0HZP)
- *	EAGLE         	EAGLE
- *	PC100         	PC100 
- *	PRIMUS        	PRIMUS-PC (DG9BL)
- *	DRSI          	DRSI PC*Packet
- *	BAYCOM        	BayCom (U)SCC
- *	
- */
-
-int     Nchips	     = 2	; /* number of chips */
-io_port Vector_Latch = 0	; /* addr. of INTACK-Latch (0 for poll mode) */
-int     Ivec	     = 7	; /* interrupt vector */
-long    Clock	     = 4915200	; /* frequency of the scc clock */
-char	Board	     = BAYCOM	; /* what type of SCC card do you use? */
-int	Option	     = 0	; /* command for extra hardware */
-io_port Special_Port = 0	; /* port address for special hardware */
-				  /* (for EAGLE, PC100, PRIMUS, DRSI) */
-
-			/*      ^  never remove the semicolon !! */
-			
-
-
-/* 			Channel    A      B	    Chip	*/
-/*			         ============	  ========	*/
-/* Control ports:						*/
-
-io_port SCC_ctrl[MAXSCC * 2] = 	{0x304, 0x305,  /* ...one... 	*/
-				 0x306, 0x307,  /* ...two...	*/
-				     0,     0,  /* ...three...	*/
-				     0,     0}; /* ...four...	*/
-
-/* Data ports:							*/
-
-io_port SCC_data[MAXSCC * 2] =  {0x300, 0x301,	/* ...one...	*/
-				 0x302, 0x303,	/* ...two...	*/
-				     0,     0,	/* ...three...	*/
-				     0,     0};	/* ...four...	*/
-
-
-/* set to '1' if you have and want ESCC chip (8580/85180/85280) support */
-
-/*					      Chip	*/
-/*				            ========   	*/
-int SCC_Enhanced[MAXSCC] =	{0,	/* ...one...	*/
-				 0,  	/* ...two...	*/
-				 0,  	/* ...three...	*/
-				 0};	/* ...four...	*/
-
-/* some useful #defines. You might need them or not */
-
-#define VERBOSE_BOOTMSG 1
-#undef  SCC_DELAY		/* perhaps a 486DX2 is a *bit* too fast */
-#undef  SCC_LDELAY		/* slow it even a bit more down */
-#undef  DONT_CHECK		/* don't look if the SCCs you specified are available */
-#define DO_FAST_RX		/* experimental timer routine called immediateley */
-				/* after every received frame */
-
-
-/* The external clocking, nrz and fullduplex divider configuration is gone */
-/* you can set these parameters in /etc/z8530drv.rc and initialize the  */
-/* driver with sccinit */

drivers/net/3c503.c

@@ -475,6 +475,7 @@ el2_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
 {
     unsigned int i;
     unsigned long hdr_start = dev->mem_start + ((ring_page - EL2_MB1_START_PG)<<8);
+    unsigned long fifo_watchdog;
 
     if (dev->mem_start) {       /* Use the shared memory. */
 #ifdef notdef
@@ -492,7 +493,15 @@ el2_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
     outb_p((ei_status.interface_num == 0 ? ECNTRL_THIN : ECNTRL_AUI) | ECNTRL_INPUT
 	   | ECNTRL_START, E33G_CNTRL);
 
-    /* Header is less than 8 bytes, so we can ignore the FIFO. */
+    /* Header is < 8 bytes, so only check the FIFO at the beginning. */
+    fifo_watchdog = jiffies;
+    while ((inb(E33G_STATUS) & ESTAT_DPRDY) == 0) {
+	if (jiffies - fifo_watchdog > 2*HZ/100) {
+		printk("%s: FIFO blocked in el2_get_8390_hdr.\n", dev->name);
+		break;
+	}
+    }
+
     for(i = 0; i < sizeof(struct e8390_pkt_hdr); i++)
 	((char *)(hdr))[i] = inb_p(E33G_FIFOH);
 

drivers/net/3c505.c

@@ -10,7 +10,7 @@
  *		be here without 3C505 technical reference provided by
  *		3Com.
  *
- * Version:	@(#)3c505.c	0.8.3	12-Nov-95
+ * Version:	@(#)3c505.c	0.8.4	17-Dec-95
  *
  * Authors:	Linux 3c505 device driver by
  *			Craig Southeren, <craigs@ineluki.apana.org.au>
@@ -103,7 +103,7 @@ static int elp_debug = 0;
  *  3 = messages when interrupts received
  */
 
-#define	ELP_VERSION	"0.8.3"
+#define	ELP_VERSION	"0.8.4"
 
 /*****************************************************************
  *
@@ -1284,8 +1284,12 @@ elp_sense (struct device * dev)
 	int addr=dev->base_addr;
 	const char *name=dev->name;
 	long flags;
+	byte orig_HCR, orig_HSR;
 
-	byte orig_HCR=inb_control(addr),
+	if (check_region(addr, 0xf)) 
+	  return -1;  
+
+	orig_HCR=inb_control(addr);
 	orig_HSR=inb_status(addr);
 
 	if (elp_debug > 0)
@@ -1472,6 +1476,7 @@ elplus_probe (struct device *dev)
 	elp_init(dev);
 	return 0;
 }
+
 #ifdef MODULE
 static char devicename[9] = { 0, };
 static struct device dev_3c505 = {

drivers/pci/pci.c

@@ -174,9 +174,12 @@ struct pci_dev_info dev_info[] = {
 	DEVICE( ADAPTEC,	ADAPTEC_7871,	"AIC-7871"),
 	DEVICE( ADAPTEC,	ADAPTEC_7872,	"AIC-7872"),
 	DEVICE( ADAPTEC,	ADAPTEC_7873,	"AIC-7873"),
+	DEVICE( ADAPTEC,	ADAPTEC_7874,	"AIC-7874"),
 	DEVICE( ADAPTEC,	ADAPTEC_7880,	"AIC-7880U"),
 	DEVICE( ADAPTEC,	ADAPTEC_7881,	"AIC-7881U"),
 	DEVICE( ADAPTEC,	ADAPTEC_7882,	"AIC-7882U"),
+	DEVICE( ADAPTEC,	ADAPTEC_7883,	"AIC-7883U"),
+	DEVICE( ADAPTEC,	ADAPTEC_7884,	"AIC-7884U"),
   	DEVICE( ATRONICS,	ATRONICS_2015,	"IDE-2015PL"),
 	DEVICE( HER,		HER_STING,	"Stingray"),
 	DEVICE( HER,		HER_STINGARK,	"Stingray ARK 2000PV")

drivers/scsi/53c8xx_u.h

@@ -2,13 +2,13 @@
 #undef A_NCR53c7xx_msg_reject
 #undef A_NCR53c7xx_sink
 #undef A_NCR53c7xx_zero
+#undef A_NOP_insn
+#undef A_addr_reconnect_dsa_head
 #undef A_addr_scratch
-#undef A_addr_sfbr
 #undef A_addr_temp
 #undef A_dmode_memory_to_memory
 #undef A_dmode_memory_to_ncr
 #undef A_dmode_ncr_to_memory
-#undef A_dmode_ncr_to_ncr
 #undef A_dsa_check_reselect
 #undef A_dsa_cmdout
 #undef A_dsa_cmnd
@@ -20,19 +20,23 @@
 #undef A_dsa_msgout
 #undef A_dsa_msgout_other
 #undef A_dsa_next
+#undef A_dsa_restore_pointers
+#undef A_dsa_save_data_pointer
 #undef A_dsa_select
 #undef A_dsa_status
-#undef A_dsa_temp_dsa_next
-#undef A_dsa_temp_jump_resume
+#undef A_dsa_temp_addr_array_value
+#undef A_dsa_temp_addr_dsa_value
+#undef A_dsa_temp_addr_new_value
+#undef A_dsa_temp_addr_next
+#undef A_dsa_temp_addr_residual
+#undef A_dsa_temp_addr_saved_pointer
+#undef A_dsa_temp_addr_saved_residual
 #undef A_dsa_temp_lun
+#undef A_dsa_temp_next
 #undef A_dsa_temp_sync
 #undef A_dsa_temp_target
 #undef A_int_debug_break
-#undef A_int_debug_dsa_loaded
-#undef A_int_debug_head
-#undef A_int_debug_idle
-#undef A_int_debug_reselected
-#undef A_int_debug_scheduled
+#undef A_int_debug_panic
 #undef A_int_err_check_condition
 #undef A_int_err_no_phase
 #undef A_int_err_selected
@@ -50,34 +54,44 @@
 #undef A_int_test_1
 #undef A_int_test_2
 #undef A_int_test_3
-#undef A_issue_dsa_head
 #undef A_msg_buf
 #undef A_reconnect_dsa_head
 #undef A_reselected_identify
 #undef A_reselected_tag
+#undef A_schedule
 #undef A_test_dest
 #undef A_test_src
 #undef Ent_accept_message
 #undef Ent_cmdout_cmdout
 #undef Ent_command_complete
 #undef Ent_command_complete_msgin
+#undef Ent_data_transfer
+#undef Ent_datain_to_jump
 #undef Ent_debug_break
+#undef Ent_dsa_code_begin
 #undef Ent_dsa_code_check_reselect
+#undef Ent_dsa_code_fix_jump
+#undef Ent_dsa_code_restore_pointers
+#undef Ent_dsa_code_save_data_pointer
 #undef Ent_dsa_code_template
 #undef Ent_dsa_code_template_end
-#undef Ent_dsa_jump_resume
 #undef Ent_dsa_schedule
 #undef Ent_dsa_zero
+#undef Ent_end_data_transfer
 #undef Ent_initiator_abort
 #undef Ent_msg_in
+#undef Ent_msg_in_restart
+#undef Ent_other_in
+#undef Ent_other_out
 #undef Ent_other_transfer
 #undef Ent_reject_message
 #undef Ent_reselected_check_next
+#undef Ent_reselected_ok
 #undef Ent_respond_message
-#undef Ent_schedule
 #undef Ent_select
 #undef Ent_select_msgout
 #undef Ent_target_abort
 #undef Ent_test_1
 #undef Ent_test_2
 #undef Ent_test_2_msgout
+#undef Ent_wait_reselect

drivers/scsi/aha152x.h

@@ -2,7 +2,7 @@
 #define _AHA152X_H
 
 /*
- * $Id: aha152x.h,v 1.11 1995/12/07 01:03:20 fischer Exp root $
+ * $Id: aha152x.h,v 1.12 1995/12/07 01:03:48 fischer Exp fischer $
  */
 
 #if defined(__KERNEL__)
@@ -23,7 +23,7 @@ int aha152x_proc_info(char *buffer, char **start, off_t offset, int length, int
    (unless we support more than 1 cmd_per_lun this should do) */
 #define AHA152X_MAXQUEUE	7		
 
-#define AHA152X_REVID "Adaptec 152x SCSI driver; $Revision: 1.11 $"
+#define AHA152X_REVID "Adaptec 152x SCSI driver; $Revision: 1.12 $"
 
 extern struct proc_dir_entry proc_scsi_aha152x;
 

fs/dquot.c

@@ -33,7 +33,6 @@
 #include <linux/mount.h>
 
 #include <asm/segment.h>
-#include <sys/sysmacros.h>
 
 #define __DQUOT_VERSION__	"dquot_5.6.0"