Menu
▾
▴
linux-vax-commit — [LIST CLOSED] Notifications of commits to complete Linux/VAX CVS tree
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
(9) |
Apr
(27) |
May
(5) |
Jun
(8) |
Jul
(50) |
Aug
(286) |
Sep
(2) |
Oct
(43) |
Nov
(4) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(79) |
Feb
(102) |
Mar
(29) |
Apr
(2) |
May
(22) |
Jun
(41) |
Jul
(11) |
Aug
(28) |
Sep
(58) |
Oct
(4) |
Nov
(18) |
Dec
(8) |
| 2002 |
Jan
(2) |
Feb
(2) |
Mar
(1) |
Apr
(478) |
May
(469) |
Jun
(78) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(47) |
Nov
(5) |
Dec
(227) |
| 2003 |
Jan
(155) |
Feb
(188) |
Mar
(160) |
Apr
(172) |
May
(41) |
Jun
(205) |
Jul
(104) |
Aug
(289) |
Sep
(31) |
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2003-08-20 02:10:00
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv15164/drivers/char
Modified Files:
tty_io.c
Log Message:
Merge with 2.5.63
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tty_io.c 19 Aug 2003 12:56:20 -0000 1.20
+++ tty_io.c 19 Aug 2003 20:41:13 -0000 1.21
@@ -155,6 +155,9 @@
extern void uart_console_init(void);
extern void sgi_serial_console_init(void);
extern void sci_console_init(void);
+extern void m68328_console_init(void);
+extern void mcfrs_console_init(void);
+extern void rs_360_init(void);
extern void tx3912_console_init(void);
extern void tx3912_rs_init(void);
extern void hvc_console_init(void);
@@ -211,11 +214,11 @@
"Warning: null TTY for (%s) in %s\n";
if (!tty) {
- printk(badtty, kdevname(device), routine);
+ printk(badtty, cdevname(device), routine);
return 1;
}
if (tty->magic != TTY_MAGIC) {
- printk(badmagic, kdevname(device), routine);
+ printk(badmagic, cdevname(device), routine);
return 1;
}
#endif
@@ -229,9 +232,8 @@
int count = 0;
file_list_lock();
- for(p = tty->tty_files.next; p != &tty->tty_files; p = p->next) {
- if(list_entry(p, struct file, f_list)->private_data == tty)
- count++;
+ list_for_each(p, &tty->tty_files) {
+ count++;
}
file_list_unlock();
if (tty->driver.type == TTY_DRIVER_TYPE_PTY &&
@@ -241,7 +243,7 @@
if (tty->count != count) {
printk(KERN_WARNING "Warning: dev (%s) tty->count(%d) "
"!= #fd's(%d) in %s\n",
- kdevname(tty->device), tty->count, count, routine);
+ cdevname(tty->device), tty->count, count, routine);
return count;
}
#endif
@@ -286,6 +288,10 @@
if (tty->ldisc.num == ldisc)
return 0; /* We are already in the desired discipline */
+
+ if (!try_module_get(ldiscs[ldisc].owner))
+ return -EINVAL;
+
o_ldisc = tty->ldisc;
tty_wait_until_sent(tty, 0);
@@ -300,9 +306,13 @@
if (tty->ldisc.open)
retval = (tty->ldisc.open)(tty);
if (retval < 0) {
+ module_put(tty->ldisc.owner);
+
tty->ldisc = o_ldisc;
tty->termios->c_line = tty->ldisc.num;
if (tty->ldisc.open && (tty->ldisc.open(tty) < 0)) {
+ module_put(tty->ldisc.owner);
+
tty->ldisc = ldiscs[N_TTY];
tty->termios->c_line = N_TTY;
if (tty->ldisc.open) {
@@ -314,7 +324,10 @@
tty_name(tty, buf), r);
}
}
+ } else {
+ module_put(o_ldisc.owner);
}
+
if (tty->ldisc.num != o_ldisc.num && tty->driver.set_ldisc)
tty->driver.set_ldisc(tty);
return retval;
@@ -427,8 +440,8 @@
{
struct tty_struct *tty = (struct tty_struct *) data;
struct file * cons_filp = NULL;
+ struct file *filp;
struct task_struct *p;
- struct list_head *l;
struct pid *pid;
int closecount = 0, n;
@@ -440,15 +453,7 @@
check_tty_count(tty, "do_tty_hangup");
file_list_lock();
- for (l = tty->tty_files.next; l != &tty->tty_files; l = l->next) {
- struct file * filp = list_entry(l, struct file, f_list);
- /*
- * If this file descriptor has been closed, ignore it; it
- * will be going away shortly. (We don't test filp->f_count
- * for zero since that could open another race.) --rmk
- */
- if (filp->private_data == NULL)
- continue;
+ list_for_each_entry(filp, &tty->tty_files, f_list) {
if (IS_CONSOLE_DEV(filp->f_dentry->d_inode->i_rdev) ||
IS_SYSCONS_DEV(filp->f_dentry->d_inode->i_rdev)) {
cons_filp = filp;
@@ -490,6 +495,8 @@
if (tty->ldisc.num != ldiscs[N_TTY].num) {
if (tty->ldisc.close)
(tty->ldisc.close)(tty);
+ module_put(tty->ldisc.owner);
+
tty->ldisc = ldiscs[N_TTY];
tty->termios->c_line = N_TTY;
if (tty->ldisc.open) {
@@ -501,7 +508,8 @@
}
read_lock(&tasklist_lock);
- if (tty->session > 0)
+ if (tty->session > 0) {
+ struct list_head *l;
for_each_task_pid(tty->session, PIDTYPE_SID, p, l, pid) {
if (p->tty == tty)
p->tty = NULL;
@@ -512,6 +520,7 @@
if (tty->pgrp > 0)
p->tty_old_pgrp = tty->pgrp;
}
+ }
read_unlock(&tasklist_lock);
tty->flags = 0;
@@ -1082,24 +1091,24 @@
#ifdef TTY_PARANOIA_CHECK
if (idx < 0 || idx >= tty->driver.num) {
printk(KERN_DEBUG "release_dev: bad idx when trying to "
- "free (%s)\n", kdevname(tty->device));
+ "free (%s)\n", cdevname(tty->device));
return;
}
if (tty != tty->driver.table[idx]) {
printk(KERN_DEBUG "release_dev: driver.table[%d] not tty "
- "for (%s)\n", idx, kdevname(tty->device));
+ "for (%s)\n", idx, cdevname(tty->device));
return;
}
if (tty->termios != tty->driver.termios[idx]) {
printk(KERN_DEBUG "release_dev: driver.termios[%d] not termios "
"for (%s)\n",
- idx, kdevname(tty->device));
+ idx, cdevname(tty->device));
return;
}
if (tty->termios_locked != tty->driver.termios_locked[idx]) {
printk(KERN_DEBUG "release_dev: driver.termios_locked[%d] not "
"termios_locked for (%s)\n",
- idx, kdevname(tty->device));
+ idx, cdevname(tty->device));
return;
}
#endif
@@ -1114,20 +1123,20 @@
if (o_tty != tty->driver.other->table[idx]) {
printk(KERN_DEBUG "release_dev: other->table[%d] "
"not o_tty for (%s)\n",
- idx, kdevname(tty->device));
+ idx, cdevname(tty->device));
return;
}
if (o_tty->termios != tty->driver.other->termios[idx]) {
printk(KERN_DEBUG "release_dev: other->termios[%d] "
"not o_termios for (%s)\n",
- idx, kdevname(tty->device));
+ idx, cdevname(tty->device));
return;
}
if (o_tty->termios_locked !=
tty->driver.other->termios_locked[idx]) {
printk(KERN_DEBUG "release_dev: other->termios_locked["
"%d] not o_termios_locked for (%s)\n",
- idx, kdevname(tty->device));
+ idx, cdevname(tty->device));
return;
}
if (o_tty->link != tty) {
@@ -1211,14 +1220,16 @@
}
/*
- * We've decremented tty->count, so we should zero out
- * filp->private_data, to break the link between the tty and
- * the file descriptor. Otherwise if filp_close() blocks before
- * the file descriptor is removed from the inuse_filp
- * list, check_tty_count() could observe a discrepancy and
- * printk a warning message to the user.
+ * We've decremented tty->count, so we need to remove this file
+ * descriptor off the tty->tty_files list; this serves two
+ * purposes:
+ * - check_tty_count sees the correct number of file descriptors
+ * associated with this tty.
+ * - do_tty_hangup no longer sees this file descriptor as
+ * something that needs to be handled for hangups.
*/
- filp->private_data = 0;
+ file_kill(filp);
+ filp->private_data = NULL;
/*
* Perform some housekeeping before deciding whether to return.
@@ -1268,11 +1279,14 @@
*/
if (tty->ldisc.close)
(tty->ldisc.close)(tty);
+ module_put(tty->ldisc.owner);
+
tty->ldisc = ldiscs[N_TTY];
tty->termios->c_line = N_TTY;
if (o_tty) {
if (o_tty->ldisc.close)
(o_tty->ldisc.close)(o_tty);
+ module_put(o_tty->ldisc.owner);
o_tty->ldisc = ldiscs[N_TTY];
}
@@ -2265,6 +2279,15 @@
#endif
#ifdef CONFIG_ARC_CONSOLE
arc_console_init();
+#endif
+#ifdef CONFIG_SERIAL_68328
+ m68328_console_init();
+#endif
+#ifdef CONFIG_SERIAL_COLDFIRE
+ mcfrs_console_init();
+#endif
+#ifdef CONFIG_SERIAL_68360
+ rs_360_init();
#endif
#ifdef CONFIG_SERIAL_TX3912_CONSOLE
tx3912_console_init();
|
|
From: Kenn H. <ke...@us...> - 2003-08-20 01:51:40
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/i386/mach-visws In directory sc8-pr-cvs1:/tmp/cvs-serv14489/arch/i386/mach-visws Removed Files: pci-visws.c Log Message: Merge with 2.5.63 --- pci-visws.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-20 01:13:20
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net In directory sc8-pr-cvs1:/tmp/cvs-serv15164/drivers/net Modified Files: Makefile Removed Files: aironet4500.h aironet4500_card.c aironet4500_core.c aironet4500_proc.c aironet4500_rid.c arlan-proc.c arlan.c arlan.h strip.c Log Message: Merge with 2.5.63 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile 5 Aug 2003 23:17:56 -0000 1.24 +++ Makefile 19 Aug 2003 20:41:13 -0000 1.25 @@ -59,11 +59,6 @@ # obj-$(CONFIG_MII) += mii.o -obj-$(CONFIG_AIRONET4500) += aironet4500_core.o -obj-$(CONFIG_AIRONET4500_CS) += aironet4500_core.o -obj-$(CONFIG_AIRONET4500_NONCS) += aironet4500_card.o -obj-$(CONFIG_AIRONET4500_PROC) += aironet4500_proc.o -obj-$(CONFIG_AIRONET4500_CS) += aironet4500_proc.o obj-$(CONFIG_WINBOND_840) += mii.o obj-$(CONFIG_SUNDANCE) += sundance.o mii.o @@ -111,7 +106,6 @@ obj-$(CONFIG_SLIP) += slhc.o endif -obj-$(CONFIG_STRIP) += strip.o obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_BONDING) += bonding.o obj-$(CONFIG_DE600) += de600.o @@ -136,7 +130,6 @@ obj-$(CONFIG_EEXPRESS_PRO) += eepro.o obj-$(CONFIG_8139CP) += 8139cp.o mii.o obj-$(CONFIG_8139TOO) += 8139too.o mii.o -obj-$(CONFIG_ARLAN) += arlan.o arlan-proc.o obj-$(CONFIG_ZNET) += znet.o obj-$(CONFIG_LAN_SAA9730) += saa9730.o obj-$(CONFIG_DEPCA) += depca.o --- aironet4500.h DELETED --- --- aironet4500_card.c DELETED --- --- aironet4500_core.c DELETED --- --- aironet4500_proc.c DELETED --- --- aironet4500_rid.c DELETED --- --- arlan-proc.c DELETED --- --- arlan.c DELETED --- --- arlan.h DELETED --- --- strip.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-20 01:13:16
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv15164 Modified Files: Makefile Log Message: Merge with 2.5.63 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- Makefile 19 Aug 2003 12:56:19 -0000 1.70 +++ Makefile 19 Aug 2003 20:41:13 -0000 1.71 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 62 +SUBLEVEL = 63 EXTRAVERSION = # *DOCUMENTATION* |
|
From: Kenn H. <ke...@us...> - 2003-08-19 23:06:06
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb In directory sc8-pr-cvs1:/tmp/cvs-serv14489/drivers/usb Added Files: Makefile.lib Log Message: Merge with 2.5.63 |
|
From: Kenn H. <ke...@us...> - 2003-08-19 12:56:57
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv23575/drivers/char
Modified Files:
tty_io.c
Log Message:
Merge with 2.5.62
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tty_io.c 5 Aug 2003 23:17:56 -0000 1.19
+++ tty_io.c 19 Aug 2003 12:56:20 -0000 1.20
@@ -2043,7 +2043,7 @@
/*
* The default put_char routine if the driver did not define one.
*/
-void tty_default_put_char(struct tty_struct *tty, unsigned char ch)
+static void tty_default_put_char(struct tty_struct *tty, unsigned char ch)
{
tty->driver.write(tty, 0, &ch, 1);
}
|
|
From: Kenn H. <ke...@us...> - 2003-08-19 12:56:53
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv23575/drivers Modified Files: Makefile Log Message: Merge with 2.5.62 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile 3 Aug 2003 18:28:35 -0000 1.19 +++ Makefile 19 Aug 2003 12:56:19 -0000 1.20 @@ -45,8 +45,8 @@ obj-$(CONFIG_ISDN_BOOL) += isdn/ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ +obj-$(CONFIG_CPU_FREQ) += cpufreq/ # VAX-specific stuff obj-$(CONFIG_VAX) += vax/ obj-$(CONFIG_VSBUS) += vsbus/ - |
|
From: Kenn H. <ke...@us...> - 2003-08-19 12:56:52
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv23575 Modified Files: Makefile Log Message: Merge with 2.5.62 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- Makefile 5 Aug 2003 23:17:56 -0000 1.69 +++ Makefile 19 Aug 2003 12:56:19 -0000 1.70 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 61 +SUBLEVEL = 62 EXTRAVERSION = # *DOCUMENTATION* @@ -405,30 +405,17 @@ .PHONY: prepare prepare: include/linux/version.h include/asm include/config/MARKER -ifdef CONFIG_MODVERSIONS ifdef KBUILD_MODULES ifeq ($(origin SUBDIRS),file) $(Q)rm -rf $(MODVERDIR) - $(Q)mkdir $(MODVERDIR) else @echo '*** Warning: Overriding SUBDIRS on the command line can cause' - @echo '*** inconsistencies with module symbol versions' -endif + @echo '*** inconsistencies' endif + $(Q)mkdir -p $(MODVERDIR) endif @echo ' Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)' -# We need to build init/vermagic.o before descending since all modules -# (*.ko) need it already - -ifdef CONFIG_MODULES - -prepare: init/vermagic.o - -init/vermagic.o: include/linux/version.h - -endif - # This can be used by arch/$ARCH/Makefile to preprocess # their vmlinux.lds.S file @@ -518,21 +505,15 @@ # Build modules -.PHONY: modules __modversions -modules: $(SUBDIRS) __modversions - -ifdef CONFIG_MODVERSIONS - -__modversions: vmlinux $(SUBDIRS) - @echo ' Recording module symbol versions.'; - $(Q)$(MAKE) -rR -f scripts/Makefile.modver - -endif +.PHONY: modules +modules: $(SUBDIRS) $(if $(CONFIG_MODVERSIONS),vmlinux) + @echo ' Building modules, stage 2.'; + $(Q)$(MAKE) -rR -f scripts/Makefile.modpost # Install modules .PHONY: modules_install -modules_install: _modinst_ $(patsubst %, _modinst_%, $(SUBDIRS)) _modinst_post +modules_install: _modinst_ _modinst_post .PHONY: _modinst_ _modinst_: @@ -540,6 +521,7 @@ @rm -f $(MODLIB)/build @mkdir -p $(MODLIB)/kernel @ln -s $(TOPDIR) $(MODLIB)/build + $(Q)$(MAKE) -rR -f scripts/Makefile.modinst # If System.map exists, run depmod. This deliberately does not have a # dependency on System.map since that would run the dependency tree on @@ -552,13 +534,9 @@ depmod_opts := -b $(INSTALL_MOD_PATH) -r endif .PHONY: _modinst_post -_modinst_post: +_modinst_post: _modinst_ if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi -.PHONY: $(patsubst %, _modinst_%, $(SUBDIRS)) -$(patsubst %, _modinst_%, $(SUBDIRS)) : - $(Q)$(MAKE) -rR -f scripts/Makefile.modinst obj=$(patsubst _modinst_%,%,$@) - else # CONFIG_MODULES # Modules not configured @@ -727,8 +705,8 @@ @find . $(RCS_FIND_IGNORE) \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '*.lst' \ - -o -name '.*.d' -o -name '.*.tmp' \) -type f \ - -print | xargs rm -f + -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ + -type f -print | xargs rm -f # mrproper - delete configuration + modules + core files # |
|
From: Kenn H. <ke...@us...> - 2003-08-19 12:56:29
|
Update of /cvsroot/linux-vax/kernel-2.5/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv23575/scripts Modified Files: Makefile.build Log Message: Merge with 2.5.62 Index: Makefile.build =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.build 5 Aug 2003 23:17:56 -0000 1.9 +++ Makefile.build 19 Aug 2003 12:56:24 -0000 1.10 @@ -49,15 +49,12 @@ endif endif -ifdef CONFIG_MODVERSIONS -modules := $(obj-m) -touch-module = @echo $(@:.o=.ko) > .tmp_versions/$(@F:.o=.mod) -else -modules := $(obj-m:.o=.ko) -endif +# We keep a list of all modules in $(MODVERDIR) + +touch-module = @echo $(@:.o=.ko) > $(MODVERDIR)/$(@F:.o=.mod) __build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \ - $(if $(KBUILD_MODULES),$(modules)) \ + $(if $(KBUILD_MODULES),$(obj-m)) \ $(subdir-ym) $(build-targets) @: @@ -158,6 +155,8 @@ quiet_cmd_cc_o_c = CC $(quiet_modtag) $@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< $(listing_o_c) +# Built-in and composite module parts + %.o: %.c FORCE ifdef CONFIG_MODVERSIONS $(call if_changed_rule,vcc_o_c) @@ -165,13 +164,14 @@ $(call if_changed_dep,cc_o_c) endif -# For modversioning, we need to special case single-part modules -# to mark them in $(MODVERDIR) +# Single-part modules are special since we need to mark them in $(MODVERDIR) -ifdef CONFIG_MODVERSIONS $(single-used-m): %.o: %.c FORCE $(touch-module) +ifdef CONFIG_MODVERSIONS $(call if_changed_rule,vcc_o_c) +else + $(call if_changed_dep,cc_o_c) endif quiet_cmd_cc_lst_c = MKLST $@ @@ -202,7 +202,8 @@ %.o: %.S FORCE $(call if_changed_dep,as_o_S) -targets += $(real-objs-y) $(real-objs-m) $(EXTRA_TARGETS) $(MAKECMDGOALS) +targets += $(real-objs-y) $(real-objs-m) $(EXTRA_TARGETS) $(MAKECMDGOALS) \ + $(build-targets) # Build the compiled-in targets # --------------------------------------------------------------------------- @@ -269,29 +270,6 @@ $(call if_changed,link_multi-m) targets += $(multi-used-y) $(multi-used-m) - -# -# Rule to link modules ( .o -> .ko ) -# - -# With CONFIG_MODVERSIONS, generation of the final .ko is handled -# by scripts/Makefile.modver -ifndef CONFIG_MODVERSIONS - -quiet_cmd_link_module = LD [M] $@ -cmd_link_module = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $< init/vermagic.o - -# Don't rebuilt vermagic.o unless we actually are in the init/ dir -ifneq ($(obj),init) -init/vermagic.o: ; -endif - -$(single-used-m:.o=.ko) $(multi-used-m:.o=.ko): %.ko: %.o init/vermagic.o FORCE - $(call if_changed,link_module) - -targets += $(single-used-m:.o=.ko) $(multi-used-m:.o=.ko) - -endif # Compile programs on the host # =========================================================================== |
|
From: Kenn H. <ke...@us...> - 2003-08-19 12:53:08
|
Update of /cvsroot/linux-vax/kernel-2.5/init In directory sc8-pr-cvs1:/tmp/cvs-serv23036/init Removed Files: vermagic.c Log Message: Merge with 2.5.62 --- vermagic.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-19 12:53:08
|
Update of /cvsroot/linux-vax/kernel-2.5/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv23036/scripts Removed Files: Makefile.modver Log Message: Merge with 2.5.62 --- Makefile.modver DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-07 00:16:08
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv20440/arch/vax/kernel
Modified Files:
signal.c
Log Message:
Small signal handling changes in 2.5.61
Index: signal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/signal.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- signal.c 4 Aug 2003 23:39:01 -0000 1.11
+++ signal.c 7 Aug 2003 00:16:04 -0000 1.12
@@ -638,7 +638,7 @@
oldset = ¤t->blocked;
- signr = get_signal_to_deliver(&info, regs);
+ signr = get_signal_to_deliver(&info, regs, NULL);
if (signr > 0) {
/* Whee! Actually deliver the signal. */
handle_signal(canrestart, signr, &info, oldset, regs);
|
|
From: Kenn H. <ke...@us...> - 2003-08-07 00:16:08
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv20440/include/asm-vax
Modified Files:
signal.h
Log Message:
Small signal handling changes in 2.5.61
Index: signal.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/signal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- signal.h 23 Jan 2003 23:18:11 -0000 1.4
+++ signal.h 7 Aug 2003 00:16:04 -0000 1.5
@@ -152,6 +152,9 @@
struct k_sigaction {
struct sigaction sa;
};
+
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
#else
/* Here we must cater to libcs that poke about in kernel headers. */
|
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:17:59
|
Update of /cvsroot/linux-vax/kernel-2.5/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv18198/scripts Modified Files: Makefile.build Log Message: Merge with 2.5.61 Index: Makefile.build =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.build 4 Aug 2003 12:18:14 -0000 1.8 +++ Makefile.build 5 Aug 2003 23:17:56 -0000 1.9 @@ -94,7 +94,7 @@ else \ $(CPP) -D__GENKSYMS__ $(c_flags) $< \ | $(GENKSYMS) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) \ - | sed -n 's/\#define __ver_\(\w*\)\W*\(\w*\)/__crc_\1 = 0x\2 ;/gp' \ + | sed -n 's/\#define __ver_\([^ ]*\)[ ]*\([^ ]*\)/__crc_\1 = 0x\2 ;/gp' \ > $(@D)/.tmp_$(@F:.o=.ver); \ \ $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \ |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:17:59
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv18198/drivers/net
Modified Files:
Makefile Space.c
Log Message:
Merge with 2.5.61
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile 4 Aug 2003 12:18:14 -0000 1.23
+++ Makefile 5 Aug 2003 23:17:56 -0000 1.24
@@ -33,6 +33,7 @@
obj-$(CONFIG_DGRS) += dgrs.o
obj-$(CONFIG_RCPCI) += rcpci.o
obj-$(CONFIG_VORTEX) += 3c59x.o
+obj-$(CONFIG_TYPHOON) += typhoon.o
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
obj-$(CONFIG_PCNET32) += pcnet32.o mii.o
obj-$(CONFIG_EEPRO100) += eepro100.o mii.o
Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Space.c 4 Aug 2003 12:18:14 -0000 1.10
+++ Space.c 5 Aug 2003 23:17:56 -0000 1.11
@@ -226,9 +226,6 @@
#ifdef CONFIG_EL2 /* 3c503 */
{el2_probe, 0},
#endif
-#ifdef CONFIG_EL3
- {el3_probe, 0},
-#endif
#ifdef CONFIG_HPLAN
{hp_probe, 0},
#endif
@@ -568,6 +565,8 @@
#ifdef CONFIG_TR
/* Token-ring device probe */
extern int ibmtr_probe(struct net_device *);
+extern int sk_isa_probe(struct net_device *);
+extern int proteon_probe(struct net_device *);
extern int smctr_probe(struct net_device *);
static int
@@ -576,6 +575,12 @@
if (1
#ifdef CONFIG_IBMTR
&& ibmtr_probe(dev)
+#endif
+#ifdef CONFIG_SKISA
+ && sk_isa_probe(dev)
+#endif
+#ifdef CONFIG_PROTEON
+ && proteon_probe(dev)
#endif
#ifdef CONFIG_SMCTR
&& smctr_probe(dev)
|
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:17:59
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-x86_64 In directory sc8-pr-cvs1:/tmp/cvs-serv18198/include/asm-x86_64 Modified Files: dma-mapping.h Log Message: Merge with 2.5.61 Index: dma-mapping.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-x86_64/dma-mapping.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dma-mapping.h 3 Aug 2003 19:00:40 -0000 1.3 +++ dma-mapping.h 5 Aug 2003 23:17:56 -0000 1.4 @@ -1,5 +1,5 @@ -#ifndef _ASM_X8664_DMA_MAPPING_H -#define _ASM_X8664_DMA_MAPPING_H +#ifndef _X8664_DMA_MAPPING_H +#define _X8664_DMA_MAPPING_H 1 #include <asm-generic/dma-mapping.h> |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:17:58
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv18198/drivers/char
Modified Files:
tty_io.c
Log Message:
Merge with 2.5.61
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tty_io.c 4 Aug 2003 12:18:14 -0000 1.18
+++ tty_io.c 5 Aug 2003 23:17:56 -0000 1.19
@@ -578,7 +578,7 @@
*/
void disassociate_ctty(int on_exit)
{
- struct tty_struct *tty = current->tty;
+ struct tty_struct *tty;
struct task_struct *p;
struct list_head *l;
struct pid *pid;
@@ -586,6 +586,7 @@
lock_kernel();
+ tty = current->tty;
if (tty) {
tty_pgrp = tty->pgrp;
if (on_exit && tty->driver.type != TTY_DRIVER_TYPE_PTY)
|
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:17:58
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv18198 Modified Files: Makefile Log Message: Merge with 2.5.61 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- Makefile 4 Aug 2003 12:18:14 -0000 1.68 +++ Makefile 5 Aug 2003 23:17:56 -0000 1.69 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 60 +SUBLEVEL = 61 EXTRAVERSION = # *DOCUMENTATION* @@ -36,7 +36,8 @@ SUBARCH := vax ARCH := $(SUBARCH) -KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g") +# Remove hyphens since they have special meaning in RPM filenames +KERNELPATH=kernel-$(subst -,,$(KERNELRELEASE)) UTS_MACHINE := $(ARCH) @@ -355,7 +356,7 @@ # It's a three stage process: # o .tmp_vmlinux1 has all symbols and sections, but __kallsyms is # empty -# Running kallsyms on that gives as .tmp_kallsyms1.o with +# Running kallsyms on that gives us .tmp_kallsyms1.o with # the right size # o .tmp_vmlinux2 now has a __kallsyms section of the right size, # but due to the added section, some addresses have shifted @@ -689,7 +690,7 @@ # make clean Delete all automatically generated files, including # tools and firmware. # make mrproper Delete the current configuration, and related files -# Any core files spread around is deleted as well +# Any core files spread around are deleted as well # make distclean Remove editor backup files, patch leftover files and the like # Files removed with 'make clean' @@ -885,9 +886,9 @@ $(filter-out $(cmd_$(1)),$(cmd_$@))\ $(filter-out $(cmd_$@),$(cmd_$(1)))),\ @set -e; \ - $(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \ + $(if $($(quiet)cmd_$(1)),echo ' $(subst ','\'',$($(quiet)cmd_$(1)))';) \ $(cmd_$(1)); \ - scripts/fixdep $(depfile) $@ '$(cmd_$(1))' > $(@D)/.$(@F).tmp; \ + scripts/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \ rm -f $(depfile); \ mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd) @@ -914,19 +915,19 @@ fi endef -# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj= +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=dir # Usage: # $(Q)$(MAKE) $(build)=dir build := -f scripts/Makefile.build obj -# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir # Usage: # $(Q)$(MAKE) $(clean)=dir clean := -f scripts/Makefile.clean obj # $(call descend,<dir>,<target>) # Recursively call a sub-make in <dir> with target <target> -# Usage is deprecated, because make do not see this as an invocation of make. +# Usage is deprecated, because make does not see this as an invocation of make. descend =$(Q)$(MAKE) -f scripts/Makefile.build obj=$(1) $(2) FORCE: |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:13:05
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/message/i2o In directory sc8-pr-cvs1:/tmp/cvs-serv17362/drivers/message/i2o Removed Files: i2o_lan.c Log Message: Merge with 2.5.61 --- i2o_lan.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:13:05
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux In directory sc8-pr-cvs1:/tmp/cvs-serv17362/include/linux Removed Files: pc_keyb.h Log Message: Merge with 2.5.61 --- pc_keyb.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:13:05
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char/agp In directory sc8-pr-cvs1:/tmp/cvs-serv17362/drivers/char/agp Removed Files: via-kt400.c Log Message: Merge with 2.5.61 --- via-kt400.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:13:05
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net/tokenring In directory sc8-pr-cvs1:/tmp/cvs-serv17362/drivers/net/tokenring Removed Files: tmsisa.c Log Message: Merge with 2.5.61 --- tmsisa.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:13:04
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/i386/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv17362/arch/i386/kernel Removed Files: acpi.c acpi_wakeup.S Log Message: Merge with 2.5.61 --- acpi.c DELETED --- --- acpi_wakeup.S DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-05 23:13:04
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi In directory sc8-pr-cvs1:/tmp/cvs-serv17362/drivers/acpi Removed Files: sleep.c Log Message: Merge with 2.5.61 --- sleep.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-04 23:39:04
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv15147/arch/vax/kernel
Modified Files:
init_task.c signal.c
Log Message:
Merge with 2.5.60
Index: init_task.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/init_task.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- init_task.c 14 Feb 2003 02:21:34 -0000 1.7
+++ init_task.c 4 Aug 2003 23:39:01 -0000 1.8
@@ -14,6 +14,7 @@
static struct fs_struct init_fs = INIT_FS;
static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
+static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
/*
Index: signal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/signal.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- signal.c 9 Jul 2003 23:10:17 -0000 1.10
+++ signal.c 4 Aug 2003 23:39:01 -0000 1.11
@@ -53,11 +53,11 @@
sigset_t saveset;
mask &= _BLOCKABLE;
- spin_lock_irq(¤t->sig->siglock);
+ spin_lock_irq(¤t->sighand->siglock);
saveset = current->blocked;
siginitset(¤t->blocked, mask);
recalc_sigpending();
- spin_unlock_irq(¤t->sig->siglock);
+ spin_unlock_irq(¤t->sighand->siglock);
regs->r0 = -EINTR;
while (1) {
@@ -87,11 +87,11 @@
return -EFAULT;
sigdelsetmask(&newset, ~_BLOCKABLE);
- spin_lock_irq(¤t->sig->siglock);
+ spin_lock_irq(¤t->sighand->siglock);
saveset = current->blocked;
current->blocked = newset;
recalc_sigpending();
- spin_unlock_irq(¤t->sig->siglock);
+ spin_unlock_irq(¤t->sighand->siglock);
regs->r0 = -EINTR;
while (1) {
@@ -219,10 +219,10 @@
goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE);
- spin_lock_irq(¤t->sig->siglock);
+ spin_lock_irq(¤t->sighand->siglock);
current->blocked = set;
recalc_sigpending();
- spin_unlock_irq(¤t->sig->siglock);
+ spin_unlock_irq(¤t->sighand->siglock);
if (restore_sigcontext(regs, &frame->sc))
goto badframe;
@@ -259,10 +259,10 @@
goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE);
- spin_lock_irq(¤t->sig->siglock);
+ spin_lock_irq(¤t->sighand->siglock);
current->blocked = set;
recalc_sigpending();
- spin_unlock_irq(¤t->sig->siglock);
+ spin_unlock_irq(¤t->sighand->siglock);
if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
goto badframe;
@@ -557,7 +557,7 @@
handle_signal(int canrestart, unsigned long sig, siginfo_t *info,
sigset_t *oldset, struct pt_regs * regs)
{
- struct k_sigaction *ka = ¤t->sig->action[sig-1];
+ struct k_sigaction *ka = ¤t->sighand->action[sig-1];
/* Are we from a system call? */
if (canrestart) {
@@ -602,11 +602,11 @@
ka->sa.sa_handler = SIG_DFL;
if (!(ka->sa.sa_flags & SA_NODEFER)) {
- spin_lock_irq(¤t->sig->siglock);
+ spin_lock_irq(¤t->sighand->siglock);
sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask);
sigaddset(¤t->blocked,sig);
recalc_sigpending();
- spin_unlock_irq(¤t->sig->siglock);
+ spin_unlock_irq(¤t->sighand->siglock);
}
}
|
