[linuxsh-dev] 2.5.7

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Include changes from mainline 2.5.7.

2002-03-22  NIIBE Yutaka  <gn...@m1...>

	Update to 2.5.7.
	* AGAINST-2.5.7: New file.
	* AGAINST-2.5.6: Removed.
	* Makefile: Version 2.5.7.
	* Makefile, arch/sh/Config.help, arch/sh/config.in,
	drivers/Makefile, drivers/pci/pci.ids, kernel/ptrace.c, mm/memory.c:
	Include changes from mainline (2.5.7).

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.11
diff -u -3 -p -r1.11 Makefile

--- Makefile	22 Mar 2002 04:44:45 -0000	1.11
+++ Makefile	22 Mar 2002 04:55:46 -0000
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 6
+SUBLEVEL = 7
 EXTRAVERSION = -sh
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -167,7 +167,6 @@ DRIVERS-$(CONFIG_PCMCIA_CHRDEV) += drive
 DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
 DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
 DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
 DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
@@ -247,14 +246,14 @@ MRPROPER_DIRS = \
 
 include arch/$(ARCH)/Makefile
 
-export	CPPFLAGS CFLAGS AFLAGS
+export	CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
 
 export	NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
 
 .S.s:
-	$(CPP) $(AFLAGS) -traditional -o $*.s $<
+	$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -o $*.s $<
 .S.o:
-	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
+	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -c -o $*.o $<
 
 Version: dummy
 	@rm -f include/linux/compile.h
Index: arch/sh/Config.help
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/Config.help,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Config.help
--- arch/sh/Config.help	26 Feb 2002 09:15:15 -0000	1.3
+++ arch/sh/Config.help	22 Mar 2002 04:55:46 -0000
@@ -623,34 +623,6 @@ CONFIG_RTC
   The module is called rtc.o. If you want to compile it as a module,
   say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_SOUND
-  If you have a sound card in your computer, i.e. if it can say more
-  than an occasional beep, say Y.  Be sure to have all the information
-  about your sound card and its configuration down (I/O port,
-  interrupt and DMA channel), because you will be asked for it.
-
-  You want to read the Sound-HOWTO, available from
-  <http://www.linuxdoc.org/docs.html#howto>. General information about
-  the modular sound system is contained in the files
-  <file:Documentation/sound/Introduction>.  The file
-  <file:Documentation/sound/README.OSS> contains some slightly
-  outdated but still useful information as well.
-
-  If you have a PnP sound card and you want to configure it at boot
-  time using the ISA PnP tools (read
-  <http://www.roestock.demon.co.uk/isapnptools/>), then you need to
-  compile the sound card support as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want)
-  and load that module after the PnP configuration is finished.  To do
-  this, say M here and read <file:Documentation/modules.txt> as well
-  as <file:Documentation/sound/README.modules>; the module will be
-  called soundcore.o.
-
-  I'm told that even without a sound card, you can make your computer
-  say more than an occasional beep, by programming the PC speaker.
-  Kernel patches and supporting utilities to do that are in the pcsp
-  package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
-
 CONFIG_MAGIC_SYSRQ
   If you say Y here, you will have some control over the system even
   if the system crashes for example during kernel debugging (e.g., you
Index: arch/sh/config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/config.in,v
retrieving revision 1.6
diff -u -3 -p -r1.6 config.in
--- arch/sh/config.in	22 Mar 2002 00:59:15 -0000	1.6
+++ arch/sh/config.in	22 Mar 2002 04:55:47 -0000
@@ -218,7 +218,6 @@ tristate 'ATA/IDE/MFM/RLL support' CONFI
 if [ "$CONFIG_IDE" != "n" ]; then
   source drivers/ide/Config.in
 else
-  define_bool CONFIG_BLK_DEV_IDE_MODES n
   define_bool CONFIG_BLK_DEV_HD n
 fi
 endmenu
Index: drivers/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/Makefile,v
retrieving revision 1.6
diff -u -3 -p -r1.6 Makefile
--- drivers/Makefile	22 Mar 2002 04:44:45 -0000	1.6
+++ drivers/Makefile	22 Mar 2002 04:55:47 -0000
@@ -8,12 +8,14 @@
 
 mod-subdirs :=	dio mtd sbus video macintosh usb input telephony sgi ide \
 		message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
-		fc4 net/hamradio i2c acpi bluetooth input/serio input/gameport maple
+		fc4 net/hamradio i2c acpi bluetooth input/serio \
+		input/gameport parport hotplug maple
 
-subdir-y :=	base parport char block net misc media cdrom hotplug
+subdir-y :=	base char block net misc media cdrom
 subdir-m :=	$(subdir-y)
 
-
+subdir-$(CONFIG_PARPORT)	+= parport
+subdir-$(CONFIG_HOTPLUG_PCI)	+= hotplug
 subdir-$(CONFIG_DIO)		+= dio
 subdir-$(CONFIG_PCI)		+= pci
 subdir-$(CONFIG_PCMCIA)		+= pcmcia
Index: drivers/pci/pci.ids
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/pci/pci.ids,v
retrieving revision 1.4
diff -u -3 -p -r1.4 pci.ids
--- drivers/pci/pci.ids	22 Mar 2002 04:44:46 -0000	1.4
+++ drivers/pci/pci.ids	22 Mar 2002 04:55:47 -0000
@@ -526,8 +526,10 @@
 	2040  79c974
 	7006  AMD-751 [Irongate] System Controller
 	7007  AMD-751 [Irongate] AGP Bridge
-	700e  AMD-760 [Irongate] System Controller
-	700f  AMD-760 [Irongate] AGP Bridge
+	700c  AMD-760 MP [IGD4-2P] System Controller
+	700d  AMD-760 MP [IGD4-2P] AGP Bridge
+	700e  AMD-760 [IGD4-1P] System Controller
+	700f  AMD-760 [IGD4-1P] AGP Bridge
 	7400  AMD-755 [Cobra] ISA
 	7401  AMD-755 [Cobra] IDE
 	7403  AMD-755 [Cobra] ACPI
@@ -540,11 +542,21 @@
 	7411  AMD-765 [Viper] IDE
 	7413  AMD-765 [Viper] ACPI
 	7414  AMD-765 [Viper] USB
-	7440  AMD-768 [??] ISA
-	7441  AMD-768 [??] IDE
-	7443  AMD-768 [??] ACPI
-	7448  AMD-768 [??] PCI
-	7449  AMD-768 [??] USB
+	7440  AMD-768 [Opus] ISA
+	7441  AMD-768 [Opus] IDE
+	7443  AMD-768 [Opus] ACPI
+	7448  AMD-768 [Opus] PCI
+	7449  AMD-768 [Opus] USB
+	7454  AMD-8151 System Controller
+	7455  AMD-8151 AGP Bridge
+	7460  AMD-8111 PCI
+	7461  AMD-8111 USB
+	7462  AMD-8111 Ethernet
+	7468  AMD-8111 LPC
+	7469  AMD-8111 IDE
+	746a  AMD-8111 SMBus 2.0
+	746b  AMD-8111 ACPI
+	746d  AMD-8111 AC97 Audio
 1023  Trident Microsystems
 	0194  82C194
 	2000  4DWave DX
@@ -1055,11 +1067,11 @@
 1052  ?Young Micro Systems
 1053  Young Micro Systems
 1054  Hitachi, Ltd
-1055  EFAR Microsystems
-	9130  EIDE Controller
-	9460  PCI to ISA Bridge
-	9462  USB Universal Host Controller [OHCI]
-	9463  Power Management Controller [Bridge]
+1055  Efar Microsystems
+	9130  slc90e66 [Victory66] IDE
+	9460  slc90e66 [Victory66] ISA
+	9462  slc90e66 [Victory66] USB
+	9463  slc90e66 [Victory66] ACPI
 1056  ICL
 # Motorola made a mistake and used 1507 instead of 1057 in some chips. Please look at the 1507 entry as well when updating this.
 1057  Motorola
@@ -1925,6 +1937,7 @@
 	0151  NV15 DDR (GeForce2 GTS)
 	0152  NV15 Bladerunner (GeForce2 Ultra)
 	0153  NV15 GL (Quadro2 Pro)
+	01bc  nForce IDE
 	0200  NV20 (GeForce3)
 	0203  Quadro DCC
 10df  Emulex Corporation
@@ -5068,6 +5081,8 @@
 	244c  82820 820 (Camino 2) Chipset ISA Bridge (ICH2-M)
 	244e  82820 820 (Camino 2) Chipset PCI
 	2485  AC'97 Audio Controller
+	248a  82801CAM ICH3-M IDE
+	248b  82801CA ICH3 IDE
 	2500  82820 820 (Camino) Chipset Host Bridge (MCH)
 		1043 801c  P3C-2000 system chipset
 	2501  82820 820 (Camino) Chipset Host Bridge (MCH)
@@ -5120,10 +5135,10 @@
 	71a0  440GX - 82443GX Host bridge
 	71a1  440GX - 82443GX AGP bridge
 	71a2  440GX - 82443GX Host bridge (AGP disabled)
-	7600  82372FB PCI to ISA Bridge
-	7601  82372FB PIIX4 IDE
-	7602  82372FB [PCI-to-USB UHCI]
-	7603  82372FB System Management Bus Controller
+	7600  82372FB PIIX5 ISA
+	7601  82372FB PIIX5 IDE
+	7602  82372FB PIIX5 USB
+	7603  82372FB PIIX5 SMBus
 	7800  i740
 		1092 0100  Stealth II G460
 		8086 0100  Intel740 Graphics Accelerator
Index: kernel/ptrace.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/kernel/ptrace.c,v
retrieving revision 1.6
diff -u -3 -p -r1.6 ptrace.c
--- kernel/ptrace.c	22 Mar 2002 03:58:40 -0000	1.6
+++ kernel/ptrace.c	22 Mar 2002 04:55:47 -0000
@@ -24,7 +24,7 @@ int ptrace_check_attach(struct task_stru
 	if (!(child->ptrace & PT_PTRACED))
 		return -ESRCH;
 
-	if (child->p_pptr != current)
+	if (child->parent != current)
 		return -ESRCH;
 
 	if (!kill) {
@@ -70,9 +70,9 @@ int ptrace_attach(struct task_struct *ta
 	task_unlock(task);
 
 	write_lock_irq(&tasklist_lock);
-	if (task->p_pptr != current) {
+	if (task->parent != current) {
 		REMOVE_LINKS(task);
-		task->p_pptr = current;
+		task->parent = current;
 		SET_LINKS(task);
 	}
 	write_unlock_irq(&tasklist_lock);
@@ -98,7 +98,7 @@ int ptrace_detach(struct task_struct *ch
 	child->exit_code = data;
 	write_lock_irq(&tasklist_lock);
 	REMOVE_LINKS(child);
-	child->p_pptr = child->p_opptr;
+	child->parent = child->real_parent;
 	SET_LINKS(child);
 	write_unlock_irq(&tasklist_lock);
 
Index: mm/memory.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/mm/memory.c,v
retrieving revision 1.8
diff -u -3 -p -r1.8 memory.c
--- mm/memory.c	22 Mar 2002 04:44:46 -0000	1.8
+++ mm/memory.c	22 Mar 2002 04:55:47 -0000
@@ -140,6 +140,9 @@ void clear_page_tables(struct mm_struct 
 		page_dir++;
 	} while (--nr);
 	spin_unlock(&mm->page_table_lock);
+
+	/* keep the page table cache within bounds */
+	check_pgt_cache();
 }
 
 pte_t * pte_alloc_map(struct mm_struct *mm, pmd_t *pmd, unsigned long address)


