linux-mips-commits — CVS Commit Patches

[Linux-mips-commits]CVS: linux/drivers/ide ide-pci.c,1.11,1.12

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/ide
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/ide

Modified Files:
	ide-pci.c 
Log Message:
Sync with OSS 2.4.14.



Index: ide-pci.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/ide/ide-pci.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ide-pci.c	2001/11/06 00:30:44	1.11
+++ ide-pci.c	2001/11/06 09:10:21	1.12
@@ -37,6 +37,7 @@
 #define DEVID_PIIX4NX	((ide_pci_devid_t){PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82451NX})
 #define DEVID_PIIX4U3	((ide_pci_devid_t){PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_9})
 #define DEVID_PIIX4U4	((ide_pci_devid_t){PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_8})
+#define DEVID_PIIX4U5	((ide_pci_devid_t){PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_10})
 #define DEVID_VIA_IDE	((ide_pci_devid_t){PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C561})
 #define DEVID_MR_IDE	((ide_pci_devid_t){PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C576_1})
 #define DEVID_VP_IDE	((ide_pci_devid_t){PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C586_1})
@@ -398,6 +399,7 @@
 	{DEVID_PIIX4NX,	"PIIX4",	PCI_PIIX,	NULL,		INIT_PIIX,	NULL,		{{0x41,0x80,0x80}, {0x43,0x80,0x80}},	ON_BOARD,	0 },
 	{DEVID_PIIX4U3,	"PIIX4",	PCI_PIIX,	ATA66_PIIX,	INIT_PIIX,	NULL,		{{0x41,0x80,0x80}, {0x43,0x80,0x80}},	ON_BOARD,	0 },
 	{DEVID_PIIX4U4, "PIIX4",	PCI_PIIX,	ATA66_PIIX,	INIT_PIIX,	NULL,		{{0x41,0x80,0x80}, {0x43,0x80,0x80}},	ON_BOARD,	0 },
+	{DEVID_PIIX4U5, "PIIX4",	PCI_PIIX,	ATA66_PIIX,	INIT_PIIX,	NULL,		{{0x41,0x80,0x80}, {0x43,0x80,0x80}},	ON_BOARD,	0 },
 	{DEVID_VIA_IDE,	"VIA_IDE",	NULL,		NULL,		NULL,		NULL,		{{0x00,0x00,0x00}, {0x00,0x00,0x00}},	ON_BOARD,	0 },
 	{DEVID_MR_IDE,	"VP_IDE",	PCI_VIA82CXXX,	ATA66_VIA82CXXX,INIT_VIA82CXXX,	DMA_VIA82CXXX,	{{0x40,0x02,0x02}, {0x40,0x01,0x01}}, 	ON_BOARD,	0 },
 	{DEVID_VP_IDE,	"VP_IDE",	PCI_VIA82CXXX,	ATA66_VIA82CXXX,INIT_VIA82CXXX,	DMA_VIA82CXXX,	{{0x40,0x02,0x02}, {0x40,0x01,0x01}}, 	ON_BOARD,	0 },

[Linux-mips-commits]CVS: linux/drivers/char Config.in,1.20,1.21 Makefile,1.16,1.17 misc.c,1.4,1.5 serial.c,1.6,1.7

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/char

Modified Files:
	Config.in Makefile misc.c serial.c 
Log Message:
Sync with OSS 2.4.14.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Config.in	2001/11/06 02:57:37	1.20
+++ Config.in	2001/11/06 09:10:21	1.21
@@ -202,7 +202,7 @@
 tristate 'Double Talk PC internal speech card support' CONFIG_DTLK
 tristate 'Siemens R3964 line discipline' CONFIG_R3964
 tristate 'Applicom intelligent fieldbus card support' CONFIG_APPLICOM
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_X86" = "y" ]; then
    dep_tristate 'Sony Vaio Programmable I/O Control Device support' CONFIG_SONYPI $CONFIG_PCI
 fi
 
@@ -213,7 +213,9 @@
    source drivers/char/ftape/Config.in
 fi
 
-tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
+if [ "$CONFIG_X86" = "y" ]; then
+   tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
+fi
 
 endmenu
 

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	2001/11/06 02:57:37	1.16
+++ Makefile	2001/11/06 09:10:21	1.17
@@ -199,6 +199,7 @@
   obj-$(CONFIG_NVRAM) += nvram.o
 endif
 obj-$(CONFIG_TOSHIBA) += toshiba.o
+obj-$(CONFIG_I8K) += i8k.o
 obj-$(CONFIG_DS1620) += ds1620.o
 obj-$(CONFIG_INTEL_RNG) += i810_rng.o
 obj-$(CONFIG_ITE_GPIO) += ite_gpio.o

Index: misc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/misc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- misc.c	2001/08/10 18:28:58	1.4
+++ misc.c	2001/11/06 09:10:21	1.5
@@ -75,6 +75,7 @@
 extern int ds1286_init(void);
 extern int pmu_device_init(void);
 extern int tosh_init(void);
+extern int i8k_init(void);
 
 static int misc_read_proc(char *buf, char **start, off_t offset,
 			  int len, int *eof, void *private)
@@ -275,6 +276,9 @@
 #endif
 #ifdef CONFIG_TOSHIBA
 	tosh_init();
+#endif
+#ifdef CONFIG_I8K
+	i8k_init();
 #endif
 #ifdef CONFIG_COBALT_LCD
         lcd_init();

Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serial.c	2001/10/19 21:19:38	1.6
+++ serial.c	2001/11/06 09:10:21	1.7
@@ -4482,7 +4482,7 @@
 	else if (serial_pci_guess_board(dev, &tmp) == 0) {
 		printk(KERN_INFO "Redundant entry in serial pci_table.  "
 		       "Please send the output of\n"
-		       "lspci -vv, this message (%d,%d,%d,%d)\n"
+		       "lspci -vv, this message (%04x,%04x,%04x,%04x)\n"
 		       "and the manufacturer and name of "
 		       "serial board or modem board\n"
 		       "to ser...@li....\n",

[Linux-mips-commits]CVS: linux/drivers/net/irda Config.in,1.1,1.2 Makefile,1.1,1.2

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net/irda
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/net/irda

Modified Files:
	Config.in Makefile 
Log Message:
Sync with OSS 2.4.14.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/irda/Config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.in	2001/10/31 18:50:55	1.1
+++ Config.in	2001/11/06 09:10:21	1.2
@@ -14,6 +14,9 @@
    dep_tristate '  Greenwich GIrBIL dongle' CONFIG_GIRBIL_DONGLE $CONFIG_IRDA
    dep_tristate '  Parallax LiteLink dongle' CONFIG_LITELINK_DONGLE $CONFIG_IRDA
    dep_tristate '  Old Belkin dongle' CONFIG_OLD_BELKIN_DONGLE $CONFIG_IRDA   
+   if [ "$CONFIG_ARCH_EP7211" = "y" ]; then
+      dep_tristate '  EP7211 I/R support' CONFIG_EP7211_IR $CONFIG_IRDA
+   fi
 fi
 
 comment 'FIR device drivers'
@@ -26,6 +29,9 @@
 dep_tristate 'SMC IrCC (Experimental)' CONFIG_SMC_IRCC_FIR $CONFIG_IRDA
 dep_tristate 'ALi M5123 FIR (Experimental)' CONFIG_ALI_FIR $CONFIG_IRDA
 dep_tristate 'VLSI 82C147 SIR/MIR/FIR (Experimental)' CONFIG_VLSI_FIR $CONFIG_IRDA
+fi
+if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
+   dep_tristate 'SA1100 Internal IR' CONFIG_SA1100_FIR $CONFIG_IRDA
 fi
 
 endmenu

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/irda/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	2001/10/31 18:50:55	1.1
+++ Makefile	2001/11/06 09:10:21	1.2
@@ -1,3 +1,4 @@
+# File: drivers/irda/Makefile
 #
 # Makefile for the Linux IrDA infrared port device drivers.
 #
@@ -15,6 +16,7 @@
 obj-$(CONFIG_USB_IRDA)		+= irda-usb.o
 obj-$(CONFIG_NSC_FIR)		+= nsc-ircc.o
 obj-$(CONFIG_WINBOND_FIR)	+= w83977af_ir.o
+obj-$(CONFIG_SA1100_FIR)	+= sa1100_ir.o
 obj-$(CONFIG_TOSHIBA_FIR)	+= toshoboe.o
 obj-$(CONFIG_SMC_IRCC_FIR)	+= smc-ircc.o	irport.o
 obj-$(CONFIG_ALI_FIR)		+= ali-ircc.o
@@ -25,6 +27,7 @@
 obj-$(CONFIG_GIRBIL_DONGLE)	+= girbil.o
 obj-$(CONFIG_LITELINK_DONGLE)	+= litelink.o
 obj-$(CONFIG_OLD_BELKIN_DONGLE)	+= old_belkin.o
+obj-$(CONFIG_EP7211_IR)		+= ep7211_ir.o
 obj-$(CONFIG_AU1000_FIR)	+= au1k_ir.o
 
 include $(TOPDIR)/Rules.make

[Linux-mips-commits]CVS: linux Makefile,1.11,1.12

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux
In directory usw-pr-cvs1:/tmp/cvs-serv23524

Modified Files:
	Makefile 
Log Message:
Sync with OSS 2.4.14.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	2001/11/06 02:57:37	1.11
+++ Makefile	2001/11/06 09:10:21	1.12
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 13
+SUBLEVEL = 14
 EXTRAVERSION = -mips
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

Re: [Linux-mips-commits]CVS: linux/drivers/net/tuliptulip_core.c,1.8,1.9

[Jun S. <js...@mv...>]

Ralf and/or Jeff (jg...@ma...) will/should take the patch.

Jun

Pete Popov wrote:
> 
> Paul,
> 
> James had applied a small patch I sent him for tulip_core.c. The
> request_irq() really should be done after the tulip_up().  With the
> patch below, we lost the fix.
> 
> Of course, the right thing to do is to send the patch to Alan so we
> don't keep bumping into this problem every time we sync with oss.
> 
> Pete
> 
> On Mon, 2001-11-05 at 16:30, Paul Mundt wrote:
> > Update of /cvsroot/linux-mips/linux/drivers/net/tulip
> > In directory usw-pr-cvs1:/tmp/cvs-serv388/drivers/net/tulip
> >
> > Modified Files:
> >       tulip_core.c
> > Log Message:
> > Sync with OSS 2.4.11.
> >
> >
> >
> > Index: tulip_core.c
> > ===================================================================
> > RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip_core.c,v
> > retrieving revision 1.8
> > retrieving revision 1.9
> > diff -u -d -r1.8 -r1.9
> > --- tulip_core.c      2001/10/26 20:35:41     1.8
> > +++ tulip_core.c      2001/11/06 00:30:45     1.9
> > @@ -513,6 +513,11 @@
> >       int retval;
> >       MOD_INC_USE_COUNT;
> >
> > +     if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) {
> > +             MOD_DEC_USE_COUNT;
> > +             return retval;
> > +     }
> > +
> >       tulip_init_ring (dev);
> >
> >       tulip_up (dev);
> > @@ -523,10 +528,6 @@
> >
> >       netif_start_queue (dev);
> >
> > -     if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) {
> > -             MOD_DEC_USE_COUNT;
> > -             return retval;
> > -     }
> >       return 0;
> >  }
> >
> >
> >
> > _______________________________________________
> > Linux-mips-commits mailing list
> > Lin...@li...
> > https://lists.sourceforge.net/lists/listinfo/linux-mips-commits
> 
> _______________________________________________
> Linux-mips-commits mailing list
> Lin...@li...
> https://lists.sourceforge.net/lists/listinfo/linux-mips-commits

[Linux-mips-commits]CVS: linux/kernel exit.c,1.7,1.8 sched.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv10490/kernel

Modified Files:
	exit.c sched.c 
Log Message:
Sync with OSS 2.4.13.



Index: exit.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/kernel/exit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exit.c	2001/10/19 21:19:40	1.7
+++ exit.c	2001/11/06 02:57:38	1.8
@@ -149,28 +149,21 @@
 }
 
 /*
- * When we die, we re-parent all our children.
- * Try to give them to another thread in our process
- * group, and if no such member exists, give it to
+ * When we die, we re-parent all our children to
  * the global child reaper process (ie "init")
  */
 static inline void forget_original_parent(struct task_struct * father)
 {
-	struct task_struct * p, *reaper;
+	struct task_struct * p;
 
 	read_lock(&tasklist_lock);
 
-	/* Next in our thread group */
-	reaper = next_thread(father);
-	if (reaper == father)
-		reaper = child_reaper;
-
 	for_each_task(p) {
 		if (p->p_opptr == father) {
 			/* We dont want people slaying init */
 			p->exit_signal = SIGCHLD;
 			p->self_exec_id++;
-			p->p_opptr = reaper;
+			p->p_opptr = child_reaper;
 			if (p->pdeath_signal) send_sig(p->pdeath_signal, p, 0);
 		}
 	}

Index: sched.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/kernel/sched.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sched.c	2001/11/06 00:30:47	1.3
+++ sched.c	2001/11/06 02:57:38	1.4
@@ -1301,6 +1301,7 @@
 
 	current->session = 1;
 	current->pgrp = 1;
+	current->tty = NULL;
 
 	/* Become as one with the init task */
 

[Linux-mips-commits]CVS: linux/include/linux pci_ids.h,1.9,1.10

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv10490/include/linux

Modified Files:
	pci_ids.h 
Log Message:
Sync with OSS 2.4.13.



Index: pci_ids.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/pci_ids.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pci_ids.h	2001/11/06 00:43:17	1.9
+++ pci_ids.h	2001/11/06 02:57:38	1.10
@@ -1605,6 +1605,17 @@
 #define PCI_DEVICE_ID_INTEL_82801BA_9	0x244b
 #define PCI_DEVICE_ID_INTEL_82801BA_10	0x244c
 #define PCI_DEVICE_ID_INTEL_82801BA_11	0x244e
+#define PCI_DEVICE_ID_INTEL_82801CA_0	0x2480
+#define PCI_DEVICE_ID_INTEL_82801CA_2	0x2482
+#define PCI_DEVICE_ID_INTEL_82801CA_3	0x2483
+#define PCI_DEVICE_ID_INTEL_82801CA_4	0x2484
+#define PCI_DEVICE_ID_INTEL_82801CA_5	0x2485
+#define PCI_DEVICE_ID_INTEL_82801CA_6	0x2486
+#define PCI_DEVICE_ID_INTEL_82801CA_7	0x2487
+#define PCI_DEVICE_ID_INTEL_82801CA_10	0x248a
+#define PCI_DEVICE_ID_INTEL_82801CA_11	0x248b
+#define PCI_DEVICE_ID_INTEL_82801CA_12	0x248c
+#define PCI_DEVICE_ID_INTEL_80310	0x530d
 #define PCI_DEVICE_ID_INTEL_82810_MC1	0x7120
 #define PCI_DEVICE_ID_INTEL_82810_IG1	0x7121
 #define PCI_DEVICE_ID_INTEL_82810_MC3	0x7122

[Linux-mips-commits]CVS: linux/fs/proc array.c,1.5,1.6 proc_misc.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/fs/proc
In directory usw-pr-cvs1:/tmp/cvs-serv10490/fs/proc

Modified Files:
	array.c proc_misc.c 
Log Message:
Sync with OSS 2.4.13.



Index: array.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/proc/array.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- array.c	2001/10/19 21:19:40	1.5
+++ array.c	2001/11/06 02:57:38	1.6
@@ -151,12 +151,13 @@
 	read_lock(&tasklist_lock);
 	buffer += sprintf(buffer,
 		"State:\t%s\n"
+		"Tgid:\t%d\n"
 		"Pid:\t%d\n"
 		"PPid:\t%d\n"
 		"TracerPid:\t%d\n"
 		"Uid:\t%d\t%d\t%d\t%d\n"
 		"Gid:\t%d\t%d\t%d\t%d\n",
-		get_task_state(p),
+		get_task_state(p), p->tgid,
 		p->pid, p->pid ? p->p_opptr->pid : 0, 0,
 		p->uid, p->euid, p->suid, p->fsuid,
 		p->gid, p->egid, p->sgid, p->fsgid);

Index: proc_misc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/proc/proc_misc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- proc_misc.c	2001/10/19 21:19:40	1.3
+++ proc_misc.c	2001/11/06 02:57:38	1.4
@@ -140,6 +140,7 @@
 {
 	struct sysinfo i;
 	int len;
+	int pg_size ;
 
 /*
  * display in kilobytes.
@@ -148,12 +149,14 @@
 #define B(x) ((unsigned long long)(x) << PAGE_SHIFT)
 	si_meminfo(&i);
 	si_swapinfo(&i);
+	pg_size = atomic_read(&page_cache_size) - i.bufferram ;
+
 	len = sprintf(page, "        total:    used:    free:  shared: buffers:  cached:\n"
 		"Mem:  %8Lu %8Lu %8Lu %8Lu %8Lu %8Lu\n"
 		"Swap: %8Lu %8Lu %8Lu\n",
 		B(i.totalram), B(i.totalram-i.freeram), B(i.freeram),
 		B(i.sharedram), B(i.bufferram),
-		B(atomic_read(&page_cache_size)), B(i.totalswap),
+		B(pg_size), B(i.totalswap),
 		B(i.totalswap-i.freeswap), B(i.freeswap));
 	/*
 	 * Tagged format, for easy grepping and expansion.
@@ -179,7 +182,7 @@
 		K(i.freeram),
 		K(i.sharedram),
 		K(i.bufferram),
-		K(atomic_read(&page_cache_size) - swapper_space.nrpages),
+		K(pg_size - swapper_space.nrpages),
 		K(swapper_space.nrpages),
 		K(nr_active_pages),
 		K(nr_inactive_pages),

[Linux-mips-commits]CVS: linux/drivers/video Config.in,1.8,1.9

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/video

Modified Files:
	Config.in 
Log Message:
Sync with OSS 2.4.13.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Config.in	2001/10/22 22:32:06	1.8
+++ Config.in	2001/11/06 02:57:38	1.9
@@ -134,9 +134,6 @@
 	 if [ "$CONFIG_FB_ATY" != "n" ]; then
 	    bool '    Mach64 GX support (EXPERIMENTAL)' CONFIG_FB_ATY_GX
 	    bool '    Mach64 CT/VT/GT/LT (incl. 3D RAGE) support' CONFIG_FB_ATY_CT
-	       if [ "$CONFIG_FB_ATY_CT" = "y" ]; then
-	          bool '      Sony Vaio C1VE 1024x480 LCD support' CONFIG_FB_ATY_CT_VAIO_LCD
-	       fi
 	 fi
  	 tristate '  ATI Radeon display support (EXPERIMENTAL)' CONFIG_FB_RADEON
 	 tristate '  ATI Rage128 display support (EXPERIMENTAL)' CONFIG_FB_ATY128

[Linux-mips-commits]CVS: linux/include/asm-mips pci.h,1.4,1.5 unistd.h,1.5,1.6

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv10490/include/asm-mips

Modified Files:
	pci.h unistd.h 
Log Message:
Sync with OSS 2.4.13.



Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pci.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pci.h	2001/10/31 18:26:52	1.4
+++ pci.h	2001/11/06 02:57:38	1.5
@@ -7,6 +7,7 @@
 #define _ASM_PCI_H
 
 #include <linux/config.h>
+#include <linux/types.h>
 
 #ifdef __KERNEL__
 
@@ -115,6 +116,35 @@
 }
 
 /*
+ * pci_{map,unmap}_single_page maps a kernel page to a dma_addr_t. identical
+ * to pci_map_single, but takes a struct page instead of a virtual address
+ */
+static inline dma_addr_t pci_map_page(struct pci_dev *hwdev, struct page *page,
+				      unsigned long offset, size_t size,
+                                      int direction)
+{
+	unsigned long addr;
+
+	if (direction == PCI_DMA_NONE)
+		BUG();
+
+	addr = (unsigned long) page_address(page);
+#ifndef CONFIG_COHERENT_IO
+	dma_cache_wback_inv(addr, size);
+#endif
+
+	return virt_to_bus((void *)addr);
+}
+
+static inline void pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
+				  size_t size, int direction)
+{
+	if (direction == PCI_DMA_NONE)
+		BUG();
+	/* Nothing to do */
+}
+
+/*
  * Map a set of buffers described by scatterlist in streaming
  * mode for DMA.  This is the scather-gather version of the
  * above pci_map_single interface.  Here the scatter gather list
@@ -215,7 +245,7 @@
  * only drive the low 24-bits during PCI bus mastering, then
  * you would pass 0x00ffffff as the mask to this function.
  */
-static inline int pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)
+static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
 {
 	/*
 	 * we fall back to GFP_DMA when the mask isn't all 1s,
@@ -228,6 +258,39 @@
 	return 1;
 }
 
+/* This is always fine. */
+/* Well ...  this actually needs more thought ...  */
+#define pci_dac_dma_supported(pci_dev, mask)	(0)
+
+#if 0
+static __inline__ dma64_addr_t
+pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page, unsigned long offset, int direction)
+{
+	return ((dma64_addr_t) page_to_bus(page) +
+		(dma64_addr_t) offset);
+}
+
+static __inline__ struct page *
+pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr)
+{
+	unsigned long poff = (dma_addr >> PAGE_SHIFT);
+
+	return mem_map + poff;
+}
+
+static __inline__ unsigned long
+pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr)
+{
+	return (dma_addr & ~PAGE_MASK);
+}
+
+static __inline__ void
+pci_dac_dma_sync_single(struct pci_dev *pdev, dma64_addr_t dma_addr,
+                        size_t len, int direction)
+{
+	/* Nothing to do. */
+}
+#endif
 
 /* Return the index of the PCI controller for device. */
 #define pci_controller_num(pdev)	(0)

Index: unistd.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/unistd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- unistd.h	2001/11/06 00:30:47	1.5
+++ unistd.h	2001/11/06 02:57:38	1.6
@@ -232,11 +232,12 @@
 #define __NR_fcntl64			(__NR_Linux + 220)
 #define __NR_security			(__NR_Linux + 221)
 #define __NR_gettid			(__NR_Linux + 222)
+#define __NR_readahead			(__NR_Linux + 223)
 
 /*
  * Offset of the last Linux flavoured syscall
  */
-#define __NR_Linux_syscalls		222
+#define __NR_Linux_syscalls		223
 
 #ifndef _LANGUAGE_ASSEMBLY
 

[Linux-mips-commits]CVS: linux/include/pcmcia ss.h,1.1,1.2

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv10490/include/pcmcia

Modified Files:
	ss.h 
Log Message:
Sync with OSS 2.4.13.



Index: ss.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/pcmcia/ss.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ss.h	2001/09/06 00:00:00	1.1
+++ ss.h	2001/11/06 02:57:38	1.2
@@ -30,6 +30,8 @@
 #ifndef _LINUX_SS_H
 #define _LINUX_SS_H
 
+#include <pcmcia/cs_types.h>
+
 /* Definitions for card status flags for GetStatus */
 #define SS_WRPROT	0x0001
 #define SS_CARDLOCK	0x0002
@@ -102,7 +104,7 @@
     u_char	map;
     u_char	flags;
     u_short	speed;
-    u_short	start, stop;
+    ioaddr_t	start, stop;
 } pccard_io_map;
 
 typedef struct pccard_mem_map {

Re: [Linux-mips-commits]CVS: linux/drivers/net/tulip tulip_core.c,1.8,1.9

[Pete P. <pp...@mv...>]

Paul, 

James had applied a small patch I sent him for tulip_core.c. The
request_irq() really should be done after the tulip_up().  With the
patch below, we lost the fix. 

Of course, the right thing to do is to send the patch to Alan so we
don't keep bumping into this problem every time we sync with oss. 

Pete 

On Mon, 2001-11-05 at 16:30, Paul Mundt wrote: 
> Update of /cvsroot/linux-mips/linux/drivers/net/tulip
> In directory usw-pr-cvs1:/tmp/cvs-serv388/drivers/net/tulip
> 
> Modified Files:
> 	tulip_core.c 
> Log Message:
> Sync with OSS 2.4.11.
> 
> 
> 
> Index: tulip_core.c
> ===================================================================
> RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip_core.c,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -d -r1.8 -r1.9
> --- tulip_core.c	2001/10/26 20:35:41	1.8
> +++ tulip_core.c	2001/11/06 00:30:45	1.9
> @@ -513,6 +513,11 @@
>  	int retval;
>  	MOD_INC_USE_COUNT;
>  
> +	if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) {
> +		MOD_DEC_USE_COUNT;
> +		return retval;
> +	}
> +
>  	tulip_init_ring (dev);
>  
>  	tulip_up (dev);
> @@ -523,10 +528,6 @@
>  
>  	netif_start_queue (dev);
>  
> -	if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) {
> -		MOD_DEC_USE_COUNT;
> -		return retval;
> -	}
>  	return 0;
>  }
>  
> 
> 
> _______________________________________________
> Linux-mips-commits mailing list
> Lin...@li...
> https://lists.sourceforge.net/lists/listinfo/linux-mips-commits

[Linux-mips-commits]CVS: linux/include/linux netdevice.h,1.5,1.6 pci_ids.h,1.8,1.9 sched.h,1.4,1.5

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv17111/include/linux

Modified Files:
	netdevice.h pci_ids.h sched.h 
Log Message:
Sync with OSS 2.4.12.



Index: netdevice.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/netdevice.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- netdevice.h	2001/09/25 03:36:36	1.5
+++ netdevice.h	2001/11/06 00:43:17	1.6
@@ -641,6 +641,41 @@
 	}
 }
 
+/*
+ * Network interface message level settings
+ */
+#define HAVE_NETIF_MSG 1
+
+enum {
+	NETIF_MSG_DRV		= 0x0001,
+	NETIF_MSG_PROBE		= 0x0002,
+	NETIF_MSG_LINK		= 0x0004,
+	NETIF_MSG_TIMER		= 0x0008,
+	NETIF_MSG_IFDOWN	= 0x0010,
+	NETIF_MSG_IFUP		= 0x0020,
+	NETIF_MSG_RX_ERR	= 0x0040,
+	NETIF_MSG_TX_ERR	= 0x0080,
+	NETIF_MSG_TX_QUEUED	= 0x0100,
+	NETIF_MSG_INTR		= 0x0200,
+	NETIF_MSG_TX_DONE	= 0x0400,
+	NETIF_MSG_RX_STATUS	= 0x0800,
+	NETIF_MSG_PKTDATA	= 0x1000,
+};
+
+#define netif_msg_drv(p)	((p)->msg_enable & NETIF_MSG_DRV)
+#define netif_msg_probe(p)	((p)->msg_enable & NETIF_MSG_PROBE)
+#define netif_msg_link(p)	((p)->msg_enable & NETIF_MSG_LINK)
+#define netif_msg_timer(p)	((p)->msg_enable & NETIF_MSG_TIMER)
+#define netif_msg_ifdown(p)	((p)->msg_enable & NETIF_MSG_IFDOWN)
+#define netif_msg_ifup(p)	((p)->msg_enable & NETIF_MSG_IFUP)
+#define netif_msg_rx_err(p)	((p)->msg_enable & NETIF_MSG_RX_ERR)
+#define netif_msg_tx_err(p)	((p)->msg_enable & NETIF_MSG_TX_ERR)
+#define netif_msg_tx_queued(p)	((p)->msg_enable & NETIF_MSG_TX_QUEUED)
+#define netif_msg_intr(p)	((p)->msg_enable & NETIF_MSG_INTR)
+#define netif_msg_tx_done(p)	((p)->msg_enable & NETIF_MSG_TX_DONE)
+#define netif_msg_rx_status(p)	((p)->msg_enable & NETIF_MSG_RX_STATUS)
+#define netif_msg_pktdata(p)	((p)->msg_enable & NETIF_MSG_PKTDATA)
+
 /* These functions live elsewhere (drivers/net/net_init.c, but related) */
 
 extern void		ether_setup(struct net_device *dev);

Index: pci_ids.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/pci_ids.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pci_ids.h	2001/11/06 00:30:47	1.8
+++ pci_ids.h	2001/11/06 00:43:17	1.9
@@ -1442,9 +1442,11 @@
 #define PCI_DEVICE_ID_TIMEDIA_1889	0x7168
 
 #define PCI_VENDOR_ID_OXSEMI		0x1415
+#define PCI_DEVICE_ID_OXSEMI_12PCI840	0x8403
 #define PCI_DEVICE_ID_OXSEMI_16PCI954	0x9501
 #define PCI_DEVICE_ID_OXSEMI_16PCI952	0x950A
 #define PCI_DEVICE_ID_OXSEMI_16PCI95N	0x9511
+#define PCI_DEVICE_ID_OXSEMI_16PCI954PP	0x9513
 
 #define PCI_VENDOR_ID_AIRONET		0x14b9
 #define PCI_DEVICE_ID_AIRONET_4800_1	0x0001

Index: sched.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/sched.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sched.h	2001/10/19 21:19:40	1.4
+++ sched.h	2001/11/06 00:43:17	1.5
@@ -369,7 +369,7 @@
 	unsigned short used_math;
 	char comm[16];
 /* file system info */
-	int link_count;
+	int link_count, total_link_count;
 	struct tty_struct *tty; /* NULL if no tty */
 	unsigned int locks; /* How many file locks are being held */
 /* ipc stuff */

[Linux-mips-commits]CVS: linux/drivers/video fbmem.c,1.11,1.12

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv17111/drivers/video

Modified Files:
	fbmem.c 
Log Message:
Sync with OSS 2.4.12.



Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fbmem.c	2001/10/31 18:52:30	1.11
+++ fbmem.c	2001/11/06 00:43:17	1.12
@@ -134,7 +134,9 @@
 extern int pvr2fb_setup(char*);
 extern int mq200fb_init(void);
 extern int mq200fb_setup(char*);
-  
+extern int sstfb_init(void);
+extern int sstfb_setup(char*);
+
 static struct {
 	const char *name;
 	int (*init)(void);
@@ -213,7 +215,9 @@
 #ifdef CONFIG_FB_SIS
 	{ "sisfb", sisfb_init, sisfb_setup },
 #endif
-
+#ifdef CONFIG_FB_VOODOO1
+	{ "sst", sstfb_init, sstfb_setup },
+#endif
 	/*
 	 * Generic drivers that are used as fallbacks
 	 * 

[Linux-mips-commits]CVS: linux/arch/mips/au1000/common Makefile,1.6,1.7 serial.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv17111/arch/mips/au1000/common

Modified Files:
	Makefile serial.c 
Log Message:
Sync with OSS 2.4.12.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	2001/10/15 16:08:26	1.6
+++ Makefile	2001/11/06 00:43:16	1.7
@@ -19,6 +19,8 @@
 
 O_TARGET := au1000.o
 
+export-objs		= prom.o serial.o
+
 obj-y := prom.o int-handler.o dma.o irq.o puts.o time.o reset.o power.o clocks.o
 
 obj-$(CONFIG_AU1000_UART) += serial.o             

Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/serial.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serial.c	2001/10/29 19:23:51	1.3
+++ serial.c	2001/11/06 00:43:16	1.4
@@ -68,9 +68,6 @@
  * End of serial driver configuration section.
  */
 
-#ifdef MODVERSIONS
-#include <linux/modversions.h>
-#endif
 #include <linux/module.h>
 
 #include <linux/types.h>

[Linux-mips-commits]CVS: linux Makefile,1.9,1.10

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux
In directory usw-pr-cvs1:/tmp/cvs-serv17111

Modified Files:
	Makefile 
Log Message:
Sync with OSS 2.4.12.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	2001/11/06 00:30:42	1.9
+++ Makefile	2001/11/06 00:43:16	1.10
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 11
+SUBLEVEL = 12
 EXTRAVERSION = -mips
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -300,7 +300,8 @@
 $(TOPDIR)/include/linux/compile.h: include/linux/compile.h
 
 newversion:
-	. scripts/mkversion > .version
+	. scripts/mkversion > .tmpversion
+	@mv -f .tmpversion .version
 
 include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion
 	@echo -n \#define UTS_VERSION \"\#`cat .version` > .ver

[Linux-mips-commits]CVS: linux/arch/mips64/mm andes.c,1.5,1.6 r4xx0.c,1.6,1.7

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64/mm
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips64/mm

Modified Files:
	andes.c r4xx0.c 
Log Message:
Sync with OSS 2.4.11.



Index: andes.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/mm/andes.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- andes.c	2001/10/22 19:16:45	1.5
+++ andes.c	2001/11/06 00:30:43	1.6
@@ -323,8 +323,8 @@
 	printk("Lo      : %016lx\n", regs->lo);
 
 	/* Saved cp0 registers. */
-	printk("epc     : %016lx\nbadvaddr: %016lx\n",
-	       regs->cp0_epc, regs->cp0_badvaddr);
+	printk("epc     : %016lx    %s\nbadvaddr: %016lx\n",
+	       regs->cp0_epc, print_tainted(), regs->cp0_badvaddr);
 	printk("Status  : %08x\nCause   : %08x\n",
 	       (unsigned int) regs->cp0_status, (unsigned int) regs->cp0_cause);
 }

Index: r4xx0.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/mm/r4xx0.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- r4xx0.c	2001/10/27 17:28:54	1.6
+++ r4xx0.c	2001/11/06 00:30:43	1.7
@@ -2103,8 +2103,8 @@
 	printk("Lo      : %016lx\n", regs->lo);
 
 	/* Saved cp0 registers. */
-	printk("epc     : %016lx\nbadvaddr: %016lx\n",
-	       regs->cp0_epc, regs->cp0_badvaddr);
+	printk("epc     : %016lx    %s\nbadvaddr: %016lx\n",
+	       regs->cp0_epc, print_tainted(), regs->cp0_badvaddr);
 	printk("Status  : %08x\nCause   : %08x\n",
 	       (unsigned int) regs->cp0_status, (unsigned int) regs->cp0_cause);
 }

[Linux-mips-commits]CVS: linux/drivers/char Config.in,1.18,1.19 Makefile,1.14,1.15

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv388/drivers/char

Modified Files:
	Config.in Makefile 
Log Message:
Sync with OSS 2.4.11.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Config.in	2001/10/27 20:36:47	1.18
+++ Config.in	2001/11/06 00:30:43	1.19
@@ -77,6 +77,14 @@
       fi
       bool '  Console on DC21285 serial port' CONFIG_SERIAL_21285_CONSOLE
    fi
+   if [ "$CONFIG_MIPS" = "y" ]; then
+     bool '  TMPTX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912
+     dep_bool '     Console on TMPTX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912
+     bool '  Enable Au1000 UART Support' CONFIG_AU1000_UART
+     if [ "$CONFIG_AU1000_UART" = "y" ]; then
+         bool '        Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE
+     fi
+   fi
 fi
 if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
    bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD
@@ -207,8 +215,8 @@
 
 dep_tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP
 if [ "$CONFIG_AGP" != "n" ]; then
-   bool '  Intel 440LX/BX/GX and I815/I840/I850 support' CONFIG_AGP_INTEL
-   bool '  Intel I810/I815 (on-board) support' CONFIG_AGP_I810
+   bool '  Intel 440LX/BX/GX and I815/I830M/I840/I850 support' CONFIG_AGP_INTEL
+   bool '  Intel I810/I815/I830M (on-board) support' CONFIG_AGP_I810
    bool '  VIA chipset support' CONFIG_AGP_VIA
    bool '  AMD Irongate, 761, and 762 support' CONFIG_AGP_AMD
    bool '  Generic SiS support' CONFIG_AGP_SIS

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	2001/10/26 17:36:56	1.14
+++ Makefile	2001/11/06 00:30:43	1.15
@@ -23,7 +23,8 @@
 
 export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
 			misc.o pty.o random.o selection.o serial.o \
-			sonypi.o tty_io.o tty_ioctl.o au1000_gpio.o
+			sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
+			au1000_gpio.o
 
 mod-subdirs	:=	joystick ftape drm pcmcia
 

[Linux-mips-commits]CVS: linux/arch/mips64/sgi-ip27 ip27-init.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips64/sgi-ip27

Modified Files:
	ip27-init.c 
Log Message:
Sync with OSS 2.4.11.



Index: ip27-init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27/ip27-init.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ip27-init.c	2001/10/27 17:28:54	1.3
+++ ip27-init.c	2001/11/06 00:30:43	1.4
@@ -522,6 +522,7 @@
 			 */
 			__cpu_number_map[cpu] = num_cpus;
 			__cpu_logical_map[num_cpus] = cpu;
+			CPUMASK_SETB(cpu_online_map, cpu);
 			num_cpus++;
 			/*
 			 * Wait this cpu to start up and initialize its hub,

[Linux-mips-commits]CVS: linux/drivers/ide Config.in,1.3,1.4 ide-pci.c,1.10,1.11

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/ide
In directory usw-pr-cvs1:/tmp/cvs-serv388/drivers/ide

Modified Files:
	Config.in ide-pci.c 
Log Message:
Sync with OSS 2.4.11.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/ide/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	2001/10/19 21:19:39	1.3
+++ Config.in	2001/11/06 00:30:44	1.4
@@ -128,7 +128,17 @@
       if [ "$CONFIG_Q40" = "y" ]; then
 	 dep_bool '  Q40/Q60 IDE interface support' CONFIG_BLK_DEV_Q40IDE $CONFIG_Q40
       fi
+      if [ "$CONFIG_8xx" = "y" ]; then
+         dep_bool '  MPC8xx IDE support' CONFIG_BLK_DEV_MPC8xx_IDE $CONFIG_8xx
+      fi
 
+      if [ "$CONFIG_BLK_DEV_MPC8xx_IDE" = "y" ]; then
+         choice 'Type of MPC8xx IDE interface'		\
+		"8xx_PCCARD	CONFIG_IDE_8xx_PCCARD	\
+		 8xx_DIRECT	CONFIG_IDE_8xx_DIRECT	\
+		 EXT_DIRECT	CONFIG_IDE_EXT_DIRECT"	8xx_PCCARD
+      fi
+
       bool '  Other IDE chipset support' CONFIG_IDE_CHIPSETS
       if [ "$CONFIG_IDE_CHIPSETS" = "y" ]; then
 	 comment 'Note: most of these also require special kernel boot parameters'
@@ -186,7 +196,8 @@
      "$CONFIG_BLK_DEV_SIS5513" = "y" -o \
      "$CONFIG_BLK_DEV_SLC90E66" = "y" -o \
      "$CONFIG_BLK_DEV_SL82C105" = "y" -o \
-     "$CONFIG_BLK_DEV_VIA82CXXX" = "y" ]; then
+     "$CONFIG_BLK_DEV_VIA82CXXX" = "y" -o \
+     "$CONFIG_BLK_DEV_MPC8xx_IDE" = "y" ]; then
    define_bool CONFIG_BLK_DEV_IDE_MODES y
 else
    define_bool CONFIG_BLK_DEV_IDE_MODES n

Index: ide-pci.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/ide/ide-pci.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ide-pci.c	2001/10/19 21:19:39	1.10
+++ ide-pci.c	2001/11/06 00:30:44	1.11
@@ -706,6 +706,8 @@
 		 */
 		if ((IDE_PCI_DEVID_EQ(d->devid, DEVID_PDC20265)) && (secondpdc++==1) && (port==1)  ) 
 			goto controller_ok;
+		if ((IDE_PCI_DEVID_EQ(d->devid, DEVID_PDC20262)) && (secondpdc++==1) && (port==1)  ) 
+			goto controller_ok;
 			
 		if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) || (tmp & e->mask) != e->val))
 			continue;	/* port not enabled */

[Linux-mips-commits]CVS: linux/arch/mips/kernel Makefile,1.13,1.14 pci-dma.c,1.5,1.6 smp.c,1.4,1.5 traps.c,1.22,1.23

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips/kernel

Modified Files:
	Makefile pci-dma.c smp.c traps.c 
Log Message:
Sync with OSS 2.4.11.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	2001/10/27 20:52:05	1.13
+++ Makefile	2001/11/06 00:30:42	1.14
@@ -15,7 +15,7 @@
 
 O_TARGET := kernel.o
 
-export-objs			= pci-dma.o smp.o
+export-objs			= pci-dma.o smp.o mips_ksyms.o
 
 obj-y				+= branch.o process.o signal.o entry.o \
 				   traps.o ptrace.o vm86.o ioport.o reset.o \

Index: pci-dma.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci-dma.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pci-dma.c	2001/10/27 20:40:12	1.5
+++ pci-dma.c	2001/11/06 00:30:42	1.6
@@ -8,9 +8,9 @@
  * swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
  */
 #include <linux/config.h>
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/pci.h>
 

Index: smp.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/smp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smp.c	2001/10/11 22:17:20	1.4
+++ smp.c	2001/11/06 00:30:42	1.5
@@ -48,7 +48,8 @@
 /* Ze Big Kernel Lock! */
 spinlock_t kernel_flag = SPIN_LOCK_UNLOCKED;
 int smp_threads_ready;  /* Not used */
-int smp_num_cpus;    
+int smp_num_cpus;    			/* Number that came online.  */
+cpumask_t cpu_online_map;		/* Bitmask of currently online CPUs */
 int global_irq_holder = NO_PROC_ID;
 spinlock_t global_irq_lock = SPIN_LOCK_UNLOCKED;
 struct cpuinfo_mips cpu_data[NR_CPUS];

Index: traps.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/traps.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- traps.c	2001/10/24 23:32:54	1.22
+++ traps.c	2001/11/06 00:30:42	1.23
@@ -223,8 +223,9 @@
 	/*
 	 * Saved cp0 registers
 	 */
-	printk("epc  : %08lx\nStatus: %08x\nCause : %08x\n",
-	       regs->cp0_epc, regs->cp0_status, regs->cp0_cause);
+	printk("epc  : %08lx    %s\nStatus: %08x\nCause : %08x\n",
+	       regs->cp0_epc, print_tainted(), regs->cp0_status,
+	       regs->cp0_cause);
 }
 
 spinlock_t die_lock;

[Linux-mips-commits]CVS: linux/arch/mips/vr4181/common irq.c,1.7,1.8

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr4181/common
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips/vr4181/common

Modified Files:
	irq.c 
Log Message:
Sync with OSS 2.4.11.



Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4181/common/irq.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- irq.c	2001/10/31 18:43:56	1.7
+++ irq.c	2001/11/06 00:30:43	1.8
@@ -82,7 +82,7 @@
 sys_irq_end(unsigned int irq)
 {
 	if(!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-		sys_irq_enable();
+		sys_irq_enable(irq);
 }
 
 static hw_irq_controller sys_irq_controller = {

[Linux-mips-commits]CVS: linux/arch/mips64/kernel smp.c,1.6,1.7

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips64/kernel

Modified Files:
	smp.c 
Log Message:
Sync with OSS 2.4.11.



Index: smp.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/smp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smp.c	2001/10/11 23:02:20	1.6
+++ smp.c	2001/11/06 00:30:43	1.7
@@ -31,6 +31,7 @@
 atomic_t smp_commenced = ATOMIC_INIT(0);
 struct cpuinfo_mips cpu_data[NR_CPUS];
 int smp_num_cpus = 1;		/* Number that came online.  */
+cpumask_t cpu_online_map;		/* Bitmask of currently online CPUs */
 int __cpu_number_map[NR_CPUS];
 int __cpu_logical_map[NR_CPUS];
 cycles_t cacheflush_time;

[Linux-mips-commits]CVS: linux/arch/mips/mm c-r5432.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips/mm

Modified Files:
	c-r5432.c 
Log Message:
Sync with OSS 2.4.11.



Index: c-r5432.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r5432.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- c-r5432.c	2001/11/04 15:57:38	1.3
+++ c-r5432.c	2001/11/06 00:30:42	1.4
@@ -42,7 +42,7 @@
 /* -------------------------------------------------------------------- */
 /* #include <asm/r4kcache.h> */
 
-extern inline void flush_icache_line_indexed(unsigned long addr)
+static inline void flush_icache_line_indexed(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -56,7 +56,7 @@
 		  "i" (Index_Invalidate_I));
 }
 
-extern inline void flush_dcache_line_indexed(unsigned long addr)
+static inline void flush_dcache_line_indexed(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -70,7 +70,7 @@
 		  "i" (Index_Writeback_Inv_D));
 }
 
-extern inline void flush_icache_line(unsigned long addr)
+static inline void flush_icache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -83,7 +83,7 @@
 		  "i" (Hit_Invalidate_I));
 }
 
-extern inline void flush_dcache_line(unsigned long addr)
+static inline void flush_dcache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -96,7 +96,7 @@
 		  "i" (Hit_Writeback_Inv_D));
 }
 
-extern inline void invalidate_dcache_line(unsigned long addr)
+static inline void invalidate_dcache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -113,7 +113,7 @@
 /*
  * The next two are for badland addresses like signal trampolines.
  */
-extern inline void protected_flush_icache_line(unsigned long addr)
+static inline void protected_flush_icache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -129,7 +129,7 @@
 		  "i" (Hit_Invalidate_I));
 }
 
-extern inline void protected_writeback_dcache_line(unsigned long addr)
+static inline void protected_writeback_dcache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -172,7 +172,7 @@
 		: "r" (base),					\
 		  "i" (op));
 
-extern inline void blast_dcache32(void)
+static inline void blast_dcache32(void)
 {
 	unsigned long start = KSEG0;
 	unsigned long end = (start + dcache_size/2);
@@ -184,7 +184,7 @@
 	}
 }
 
-extern inline void blast_dcache32_page(unsigned long page)
+static inline void blast_dcache32_page(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);
@@ -195,7 +195,7 @@
 	}
 }
 
-extern inline void blast_dcache32_page_indexed(unsigned long page)
+static inline void blast_dcache32_page_indexed(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);
@@ -207,7 +207,7 @@
 	}
 }
 
-extern inline void blast_icache32(void)
+static inline void blast_icache32(void)
 {
 	unsigned long start = KSEG0;
 	unsigned long end = (start + icache_size/2);
@@ -219,7 +219,7 @@
 	}
 }
 
-extern inline void blast_icache32_page(unsigned long page)
+static inline void blast_icache32_page(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);
@@ -230,7 +230,7 @@
 	}
 }
 
-extern inline void blast_icache32_page_indexed(unsigned long page)
+static inline void blast_icache32_page_indexed(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);

[Linux-mips-commits]CVS: linux/arch/mips/ddb5xxx/ddb5477 irq_5477.c,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/ddb5477
In directory usw-pr-cvs1:/tmp/cvs-serv388/arch/mips/ddb5xxx/ddb5477

Modified Files:
	irq_5477.c 
Log Message:
Sync with OSS 2.4.11.



Index: irq_5477.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/ddb5477/irq_5477.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- irq_5477.c	2001/10/11 20:45:26	1.2
+++ irq_5477.c	2001/11/06 00:30:42	1.3
@@ -85,6 +85,7 @@
 	db_assert(irq >= vrc5477_irq_base);
 	db_assert(irq < vrc5477_irq_base + NUM_5477_IRQ);
 
+	if(!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
 	ll_vrc5477_irq_enable( irq - vrc5477_irq_base);
 }