Menu
▾
▴
[linuxsh-dev] 2.5.8-pre1
|
From: NIIBE Y. <gn...@m1...> - 2002-04-04 09:03:30
|
Now is the time to sync up to mainline.
Paul, please note that the change of shwdt.c is from the mainline.
2002-04-04 NIIBE Yutaka <gn...@m1...>
Update to 2.5.8-pre1.
* AGAINST-2.5.8-pre1: New file.
* AGAINST-2.5.7: Removed.
* Makefile: Version 2.5.8-pre1.
* Makefile, arch/sh/kernel/sh_ksyms.c, drivers/block/rd.c,
drivers/char/shwdt.c, drivers/net/Config.in, drivers/pci/pci.ids,
init/do_mounts.c: Include changes from mainline (2.5.8-pre1).
* arch/sh/kernel/sh_ksyms.c (simple_strtol, strtok): Removed.
* drivers/char/shwdt.c (nowayout): New module option (to be
configured at runtime by Matt Domsch).
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.12
diff -u -3 -p -r1.12 Makefile
--- Makefile 22 Mar 2002 10:52:09 -0000 1.12
+++ Makefile 4 Apr 2002 08:50:42 -0000
@@ -1,12 +1,12 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 7
-EXTRAVERSION = -sh
+SUBLEVEL = 8
+EXTRAVERSION = -pre1-sh
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//")
+KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -342,7 +342,7 @@ init/main.o: init/main.c include/config/
$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
init/do_mounts.o: init/do_mounts.c include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $<
+ $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
fs lib mm ipc kernel drivers net sound: dummy
$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
Index: arch/sh/kernel/sh_ksyms.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/sh_ksyms.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 sh_ksyms.c
--- arch/sh/kernel/sh_ksyms.c 26 Mar 2002 01:56:39 -0000 1.2
+++ arch/sh/kernel/sh_ksyms.c 4 Apr 2002 08:50:42 -0000
@@ -36,9 +36,6 @@ EXPORT_SYMBOL(disable_irq_nosync);
EXPORT_SYMBOL(irq_desc);
EXPORT_SYMBOL(no_irq_type);
-EXPORT_SYMBOL(simple_strtol);
-
-EXPORT_SYMBOL(strtok);
EXPORT_SYMBOL(strpbrk);
EXPORT_SYMBOL(strstr);
EXPORT_SYMBOL(strlen);
Index: drivers/block/rd.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/block/rd.c,v
retrieving revision 1.5
diff -u -3 -p -r1.5 rd.c
--- drivers/block/rd.c 22 Mar 2002 04:44:45 -0000 1.5
+++ drivers/block/rd.c 4 Apr 2002 08:50:42 -0000
@@ -405,9 +405,10 @@ static void __exit rd_cleanup (void)
for (i = 0 ; i < NUM_RAMDISKS; i++) {
struct block_device *bdev = rd_bdev[i];
rd_bdev[i] = NULL;
- if (bdev)
+ if (bdev) {
+ invalidate_bdev(bdev, 1);
blkdev_put(bdev, BDEV_FILE);
- destroy_buffers(mk_kdev(MAJOR_NR, i));
+ }
}
devfs_unregister (devfs_handle);
Index: drivers/char/shwdt.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/shwdt.c,v
retrieving revision 1.4
diff -u -3 -p -r1.4 shwdt.c
--- drivers/char/shwdt.c 15 Jan 2002 07:59:52 -0000 1.4
+++ drivers/char/shwdt.c 4 Apr 2002 08:50:42 -0000
@@ -9,6 +9,9 @@
* 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.
+ *
+ * 14-Dec-2001 Matt Domsch <Mat...@de...>
+ * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
*/
#include <linux/config.h>
#include <linux/module.h>
@@ -88,6 +91,15 @@ static struct watchdog_info sh_wdt_info;
static struct timer_list timer;
static unsigned long next_heartbeat;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
/**
* sh_wdt_write_cnt - Write to Counter
*
@@ -175,6 +187,10 @@ static int sh_wdt_open(struct inode *ino
if (test_and_set_bit(0, &sh_is_open))
return -EBUSY;
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
+
sh_wdt_start();
break;
@@ -196,9 +212,9 @@ static int sh_wdt_open(struct inode *ino
static int sh_wdt_close(struct inode *inode, struct file *file)
{
if (minor(inode->i_rdev) == WATCHDOG_MINOR) {
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- sh_wdt_stop();
-#endif
+ if (!nowayout) {
+ sh_wdt_stop();
+ }
clear_bit(0, &sh_is_open);
}
Index: drivers/net/Config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/Config.in,v
retrieving revision 1.6
diff -u -3 -p -r1.6 Config.in
--- drivers/net/Config.in 22 Mar 2002 04:44:46 -0000 1.6
+++ drivers/net/Config.in 4 Apr 2002 08:50:42 -0000
@@ -57,6 +57,9 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
bool ' MIPS AU1000 Ethernet support' CONFIG_MIPS_AU1000_ENET
fi
+ if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
+ tristate ' SB1250 Ethernet support' CONFIG_NET_SB1250_MAC
+ fi
if [ "$CONFIG_SGI_IP27" = "y" ]; then
bool ' SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
fi
Index: drivers/pci/pci.ids
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/pci/pci.ids,v
retrieving revision 1.5
diff -u -3 -p -r1.5 pci.ids
--- drivers/pci/pci.ids 22 Mar 2002 10:52:09 -0000 1.5
+++ drivers/pci/pci.ids 4 Apr 2002 08:50:42 -0000
@@ -824,6 +824,8 @@
0074 56k Voice Modem
1033 8014 RCV56ACF 56k Voice Modem
009b Vrc5476
+ 00a6 VRC5477 AC97
+ 00e0 USB 2.0
1034 Framatome Connectors USA Inc.
1035 Comp. & Comm. Research Lab
1036 Future Domain Corp.
@@ -1108,12 +1110,14 @@
1059 Teknor Industrial Computers Inc
105a Promise Technology, Inc.
0d30 20265
+ 1275 20275
4d30 20267
4d33 20246
4d38 20262
4d68 20268
6268 20268R
4d69 20269
+ 5275 20276
5300 DC5300
105b Foxconn International, Inc.
105c Wipro Infotech Limited
@@ -1192,11 +1196,21 @@
0017 Paddington Mac I/O
0018 UniNorth FireWire
0019 KeyLargo USB
- 001e UniNorth PCI
+ 001e UniNorth Internal PCI
001f UniNorth PCI
0020 UniNorth AGP
- 0021 UniNorth GMAC
+ 0021 UniNorth GMAC (Sun GEM)
0022 KeyLargo Mac I/O
+ 0024 UniNorth/Pangea GMAC (Sun GEM)
+ 0025 KeyLargo/Pangea Mac I/O
+ 0026 KeyLargo/Pangea USB
+ 0027 UniNorth/Pangea AGP
+ 0028 UniNorth/Pangea PCI
+ 0029 UniNorth/Pangea Internal PCI
+ 002d UniNorth 1.5 AGP
+ 002e UniNorth 1.5 PCI
+ 002f UniNorth 1.5 Internal PCI
+ 0030 UniNorth/Pangea FireWire
106c Hyundai Electronics America
8801 Dual Pentium ISA/PCI Motherboard
8802 PowerPC ISA/PCI Motherboard
@@ -2620,6 +2634,8 @@
0005 ATP850UF
0006 ATP860 NO-BIOS
0007 ATP860
+ 0008 ATP865 NO-ROM
+ 0009 ATP865
8002 AEC6710 SCSI-2 Host Adapter
8010 AEC6712UW SCSI
8020 AEC6712U SCSI
@@ -3967,7 +3983,7 @@
9511 16PCI954 Function 1
15ed 2000 Macrolink MCCR Serial p4-7 of 8
15ed 2001 Macrolink MCCR Serial p4-15 of 16
- 9521 Oxford Semi OX16PCI952 PCI/dual 16950 UART
+ 9521 16PCI952 PCI/dual 16950 UART
1416 Multiwave Innovation pte Ltd
1417 Convergenet Technologies Inc
1418 Kyushu electronics systems Inc
Index: init/do_mounts.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/init/do_mounts.c,v
retrieving revision 1.3
diff -u -3 -p -r1.3 do_mounts.c
--- init/do_mounts.c 22 Mar 2002 04:44:46 -0000 1.3
+++ init/do_mounts.c 4 Apr 2002 08:50:42 -0000
@@ -827,7 +827,7 @@ void prepare_namespace(void)
create_dev("/dev/root", ROOT_DEV, NULL);
if (mount_initrd) {
- if (initrd_load() && kdev_same(ROOT_DEV, mk_kdev(RAMDISK_MAJOR, 0))) {
+ if (initrd_load() && !kdev_same(ROOT_DEV, mk_kdev(RAMDISK_MAJOR, 0))) {
handle_initrd();
goto out;
}
|
