Menu
▾
▴
linux-vax-kern-commit — Notifications of CVS commits to kernel 2.4 source tree
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(6) |
Sep
(2) |
Oct
(43) |
Nov
(4) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(78) |
Feb
(97) |
Mar
(29) |
Apr
(2) |
May
(22) |
Jun
(38) |
Jul
(11) |
Aug
(27) |
Sep
(40) |
Oct
(2) |
Nov
(17) |
Dec
(8) |
| 2002 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(480) |
May
(456) |
Jun
(12) |
Jul
|
Aug
(1) |
Sep
|
Oct
(18) |
Nov
(3) |
Dec
(6) |
| 2003 |
Jan
|
Feb
(18) |
Mar
(1) |
Apr
|
May
(6) |
Jun
(147) |
Jul
(7) |
Aug
(3) |
Sep
(235) |
Oct
(10) |
Nov
(2) |
Dec
(1) |
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ai...@us...> - 2003-09-27 13:12:03
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/mips/au1000/pb1000 In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/mips/au1000/pb1000 Removed Files: pci_fixup.c pci_ops.c setup.c Log Message: merge 2.4.22 --- pci_fixup.c DELETED --- --- pci_ops.c DELETED --- --- setup.c DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:12:00
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/mips/arc In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/mips/arc Removed Files: console.c Log Message: merge 2.4.22 --- console.c DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:12:00
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/tools In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/tools Removed Files: make_textsym Log Message: merge 2.4.22 --- make_textsym DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:12:00
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/mips/algor In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/mips/algor Removed Files: README Log Message: merge 2.4.22 --- README DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:11:59
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/kernel/sn2 In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/kernel/sn2 Removed Files: iomv.c Log Message: merge 2.4.22 --- iomv.c DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/kernel/sn1 In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/kernel/sn1 Removed Files: Makefile cache.c error.c iomv.c sn1_smp.c synergy.c Log Message: merge 2.4.22 --- Makefile DELETED --- --- cache.c DELETED --- --- error.c DELETED --- --- iomv.c DELETED --- --- sn1_smp.c DELETED --- --- synergy.c DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:11:58
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/io/sn2 In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/io/sn2 Removed Files: efi-rtc.c l1.c pci_bus_cvlink.c sgi_io_init.c Log Message: merge 2.4.22 --- efi-rtc.c DELETED --- --- l1.c DELETED --- --- pci_bus_cvlink.c DELETED --- --- sgi_io_init.c DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:11:58
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/io/sn2/pcibr In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/io/sn2/pcibr Removed Files: pcibr_idbg.c Log Message: merge 2.4.22 --- pcibr_idbg.c DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/kernel Removed Files: bte_regr_test.c iomv.c llsc4.c llsc4.h misctest.c sn_asm.S Log Message: merge 2.4.22 --- bte_regr_test.c DELETED --- --- iomv.c DELETED --- --- llsc4.c DELETED --- --- llsc4.h DELETED --- --- misctest.c DELETED --- --- sn_asm.S DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/io/sn1 In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/io/sn1 Removed Files: Makefile eeprom.c efi-rtc.c hub_intr.c hubcounters.c huberror.c ip37.c klconflib.c klgraph.c l1.c l1_command.c mem_refcnt.c ml_SN_init.c ml_SN_intr.c ml_iograph.c module.c pci_bus_cvlink.c pcibr.c pciio.c sgi_io_init.c xbow.c xtalk.c Log Message: merge 2.4.22 --- Makefile DELETED --- --- eeprom.c DELETED --- --- efi-rtc.c DELETED --- --- hub_intr.c DELETED --- --- hubcounters.c DELETED --- --- huberror.c DELETED --- --- ip37.c DELETED --- --- klconflib.c DELETED --- --- klgraph.c DELETED --- --- l1.c DELETED --- --- l1_command.c DELETED --- --- mem_refcnt.c DELETED --- --- ml_SN_init.c DELETED --- --- ml_SN_intr.c DELETED --- --- ml_iograph.c DELETED --- --- module.c DELETED --- --- pci_bus_cvlink.c DELETED --- --- pcibr.c DELETED --- --- pciio.c DELETED --- --- sgi_io_init.c DELETED --- --- xbow.c DELETED --- --- xtalk.c DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/io In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/io Removed Files: alenlist.c ate_utils.c eeprom.c efi-rtc.c hcl.c hcl_util.c hubdev.c hubspc.c ifconfig_bus.c ifconfig_net.c invent.c klconflib.c klgraph.c klgraph_hack.c l1.c l1_command.c labelcl.c ml_SN_init.c ml_iograph.c module.c pci.c pci_bus_cvlink.c pci_dma.c pciba.c pciio.c sgi_io_init.c stubs.c xbow.c xtalk.c Log Message: merge 2.4.22 --- alenlist.c DELETED --- --- ate_utils.c DELETED --- --- eeprom.c DELETED --- --- efi-rtc.c DELETED --- --- hcl.c DELETED --- --- hcl_util.c DELETED --- --- hubdev.c DELETED --- --- hubspc.c DELETED --- --- ifconfig_bus.c DELETED --- --- ifconfig_net.c DELETED --- --- invent.c DELETED --- --- klconflib.c DELETED --- --- klgraph.c DELETED --- --- klgraph_hack.c DELETED --- --- l1.c DELETED --- --- l1_command.c DELETED --- --- labelcl.c DELETED --- --- ml_SN_init.c DELETED --- --- ml_iograph.c DELETED --- --- module.c DELETED --- --- pci.c DELETED --- --- pci_bus_cvlink.c DELETED --- --- pci_dma.c DELETED --- --- pciba.c DELETED --- --- pciio.c DELETED --- --- sgi_io_init.c DELETED --- --- stubs.c DELETED --- --- xbow.c DELETED --- --- xtalk.c DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:11:55
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/arm/mach-sa1100 In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/arm/mach-sa1100 Removed Files: pcipool.c pcipool.h sleep.h Log Message: merge 2.4.22 --- pcipool.c DELETED --- --- pcipool.h DELETED --- --- sleep.h DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:11:55
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/fakeprom In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/ia64/sn/fakeprom Removed Files: runsim Log Message: merge 2.4.22 --- runsim DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:11:55
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/arm/boot/compressed In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/arm/boot/compressed Removed Files: hw-bse.c Log Message: merge 2.4.22 --- hw-bse.c DELETED --- |
|
From: <ai...@us...> - 2003-09-27 13:11:55
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/arm/mach-epxa10db In directory sc8-pr-cvs1:/tmp/cvs-serv3030/arch/arm/mach-epxa10db Removed Files: Makefile arch.c dma.c irq.c mm.c time.c Log Message: merge 2.4.22 --- Makefile DELETED --- --- arch.c DELETED --- --- dma.c DELETED --- --- irq.c DELETED --- --- mm.c DELETED --- --- time.c DELETED --- |
|
From: <ai...@us...> - 2003-09-27 09:24:17
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv26931/arch/vax/kernel
Modified Files:
process.c
Log Message:
don't check in debug defines doh!!
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/process.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- process.c 27 Sep 2003 09:21:13 -0000 1.22
+++ process.c 27 Sep 2003 09:24:03 -0000 1.23
@@ -24,7 +24,7 @@
#include <asm/elf.h>
-#define VAX_PROCESS_DEBUG 1
+#undef VAX_PROCESS_DEBUG
void cpu_idle(void)
{
|
|
From: <ai...@us...> - 2003-09-27 09:22:36
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv26117/arch/vax/lib
Modified Files:
console.c
Log Message:
Merge 2.4.21 - build fixes
Index: console.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/lib/console.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- console.c 17 Jan 2001 16:13:57 -0000 1.1
+++ console.c 27 Sep 2003 09:21:13 -0000 1.2
@@ -34,7 +34,6 @@
vaxcons_write,
NULL, /* read */
NULL, /* device */
- NULL, /* wait_key */
NULL, /* unblank */
NULL, /* setup */
CON_PRINTBUFFER, /* flags */
|
|
From: <ai...@us...> - 2003-09-27 09:22:36
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/scsi In directory sc8-pr-cvs1:/tmp/cvs-serv26117/drivers/scsi Modified Files: Makefile Log Message: Merge 2.4.21 - build fixes Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 27 Sep 2003 07:43:27 -0000 1.8 +++ Makefile 27 Sep 2003 09:21:17 -0000 1.9 @@ -26,6 +26,7 @@ subdir-$(CONFIG_SCSI_AACRAID) += aacraid subdir-$(CONFIG_SCSI_AIC7XXX) += aic7xxx +subdir-$(CONFIG_SCSI_AIC79XX) += aic79xx subdir-$(CONFIG_PCMCIA) += pcmcia obj-$(CONFIG_SCSI) += scsi_mod.o @@ -48,7 +49,7 @@ obj-$(CONFIG_ATARI_SCSI) += atari_scsi.o obj-$(CONFIG_MAC_SCSI) += mac_scsi.o obj-$(CONFIG_SCSI_MAC_ESP) += mac_esp.o NCR53C9x.o -obj-$(CONFIG_SUN3_SCSI) += sun3_scsi.o +obj-$(CONFIG_SUN3_SCSI) += sun3_scsi.o sun3_scsi_vme.o obj-$(CONFIG_MVME16x_SCSI) += mvme16x.o 53c7xx.o obj-$(CONFIG_BVME6000_SCSI) += bvme6000.o 53c7xx.o obj-$(CONFIG_SCSI_SIM710) += sim710.o @@ -69,6 +70,9 @@ ifeq ($(CONFIG_SCSI_AIC7XXX),y) obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/aic7xxx.o endif +ifeq ($(CONFIG_SCSI_AIC79XX),y) + obj-$(CONFIG_SCSI_AIC79XX) += aic79xx/aic79xx.o +endif obj-$(CONFIG_SCSI_AIC7XXX_OLD) += aic7xxx_old.o obj-$(CONFIG_SCSI_IPS) += ips.o obj-$(CONFIG_SCSI_FD_MCS) += fd_mcs.o @@ -127,6 +131,7 @@ obj-$(CONFIG_SCSI_FCAL) += fcal.o obj-$(CONFIG_SCSI_CPQFCTS) += cpqfc.o obj-$(CONFIG_SCSI_LASI700) += lasi700.o 53c700.o +obj-$(CONFIG_SCSI_NSP32) += nsp32.o subdir-$(CONFIG_ARCH_ACORN) += ../acorn/scsi obj-$(CONFIG_ARCH_ACORN) += ../acorn/scsi/acorn-scsi.o |
|
From: <ai...@us...> - 2003-09-27 09:22:36
|
Update of /cvsroot/linux-vax/kernel-2.4 In directory sc8-pr-cvs1:/tmp/cvs-serv26117 Modified Files: Makefile Log Message: Merge 2.4.21 - build fixes Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile 27 Sep 2003 07:43:20 -0000 1.20 +++ Makefile 27 Sep 2003 09:21:11 -0000 1.21 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 4 -SUBLEVEL = 20 +SUBLEVEL = 21 EXTRAVERSION = KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -139,8 +139,7 @@ DRIVERS-y += drivers/char/char.o \ drivers/block/block.o \ drivers/misc/misc.o \ - drivers/net/net.o \ - drivers/media/media.o + drivers/net/net.o DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o @@ -181,6 +180,7 @@ DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o +DRIVERS-y +=drivers/media/media.o DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o DRIVERS-$(CONFIG_HIL) += drivers/hil/hil.o DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o @@ -348,7 +348,7 @@ ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \ echo > .ver1 @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver - @echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -1`\" >> .ver + @echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -n 1`\" >> .ver @mv -f .ver $@ @rm -f .ver1 @@ -498,12 +498,13 @@ find . -type f -print | sort | xargs sum > .SUMS dep-files: scripts/mkdep archdep include/linux/version.h - scripts/mkdep -- init/*.c > .depend - scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend + rm -f .depend .hdepend $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" ifdef CONFIG_MODVERSIONS $(MAKE) update-modverfile endif + scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend + scripts/mkdep -- init/*.c > .depend ifdef CONFIG_MODVERSIONS MODVERFILE := $(TOPDIR)/include/linux/modversions.h |
|
From: <ai...@us...> - 2003-09-27 09:22:36
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv26117/arch/vax/kernel
Modified Files:
process.c
Log Message:
Merge 2.4.21 - build fixes
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/process.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- process.c 18 Sep 2003 13:25:59 -0000 1.21
+++ process.c 27 Sep 2003 09:21:13 -0000 1.22
@@ -24,7 +24,7 @@
#include <asm/elf.h>
-#undef VAX_PROCESS_DEBUG
+#define VAX_PROCESS_DEBUG 1
void cpu_idle(void)
{
@@ -169,7 +169,7 @@
* Create a kernel thread
*/
-pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+pid_t arch_kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
{
asm(" clrl -(%%sp) \n"
" movl %0, -(%%sp) \n"
|
|
From: <ai...@us...> - 2003-09-27 09:22:36
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv26117/drivers/char
Modified Files:
Makefile tty_io.c
Log Message:
Merge 2.4.21 - build fixes
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile 27 Sep 2003 07:43:27 -0000 1.8
+++ Makefile 27 Sep 2003 09:21:13 -0000 1.9
@@ -24,7 +24,7 @@
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 generic_serial.o \
- au1000_gpio.o hp_psaux.o nvram.o
+ au1000_gpio.o hp_psaux.o nvram.o scx200.o
mod-subdirs := joystick ftape drm drm-4.0 pcmcia
@@ -66,6 +66,20 @@
SERIAL =
endif
+ifeq ($(ARCH),parisc)
+ ifdef CONFIG_GSC_PS2
+ KEYBD = hp_psaux.o hp_keyb.o
+ else
+ KEYBD =
+ endif
+ ifdef CONFIG_SERIAL_MUX
+ CONSOLE += mux.o
+ endif
+ ifdef CONFIG_PDC_CONSOLE
+ CONSOLE += pdc_console.o
+ endif
+endif
+
ifdef CONFIG_Q40
KEYBD += q40_keyb.o
SERIAL = serial.o
@@ -208,6 +222,7 @@
obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
obj-$(CONFIG_PRINTER) += lp.o
+obj-$(CONFIG_TIPAR) += tipar.o
ifeq ($(CONFIG_INPUT),y)
obj-y += joystick/js.o
@@ -226,6 +241,7 @@
obj-$(CONFIG_PC110_PAD) += pc110pad.o
obj-$(CONFIG_MK712_MOUSE) += mk712.o
obj-$(CONFIG_RTC) += rtc.o
+obj-$(CONFIG_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
ifeq ($(CONFIG_PPC),)
obj-$(CONFIG_NVRAM) += nvram.o
@@ -260,6 +276,7 @@
obj-$(CONFIG_SERIAL_IPR) += generic_serial.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
+obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o scx200.o
# Only one watchdog can succeed. We probe the hardware watchdog
# drivers first, then the softdog driver. This means if your hardware
@@ -283,9 +300,10 @@
obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
-#obj-$(CONFIG_ALIM1535_WDT) += alim1535d_wdt.o
+obj-$(CONFIG_ALIM1535_WDT) += alim1535d_wdt.o
obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o
@@ -293,6 +311,11 @@
subdir-$(CONFIG_MWAVE) += mwave
ifeq ($(CONFIG_MWAVE),y)
obj-y += mwave/mwave.o
+endif
+
+subdir-$(CONFIG_IPMI_HANDLER) += ipmi
+ifeq ($(CONFIG_IPMI_HANDLER),y)
+ obj-y += ipmi/ipmi.o
endif
include $(TOPDIR)/Rules.make
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/tty_io.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tty_io.c 27 Sep 2003 07:43:27 -0000 1.11
+++ tty_io.c 27 Sep 2003 09:21:13 -0000 1.12
@@ -127,12 +127,6 @@
extern struct tty_driver pts_driver[]; /* Unix98 pty slaves; for /dev/ptmx */
#endif
-/*
- * redirect is the pseudo-tty that console output
- * is redirected to if asked by TIOCCONS.
- */
-struct tty_struct * redirect;
-
static void initialize_tty_struct(struct tty_struct *tty);
static ssize_t tty_read(struct file *, char *, size_t, loff_t *);
@@ -427,6 +421,8 @@
release: tty_release,
};
+static spinlock_t redirect_lock = SPIN_LOCK_UNLOCKED;
+static struct file *redirect;
/*
* This can be called by the "eventd" kernel thread. That is process synchronous,
* but doesn't hold any locks, so we need to make sure we have the appropriate
@@ -436,6 +432,7 @@
{
struct tty_struct *tty = (struct tty_struct *) data;
struct file * cons_filp = NULL;
+ struct file *f = NULL;
struct task_struct *p;
struct list_head *l;
int closecount = 0, n;
@@ -445,6 +442,15 @@
/* inuse_filps is protected by the single kernel lock */
lock_kernel();
+
+ spin_lock(&redirect_lock);
+ if (redirect && redirect->private_data == tty) {
+ f = redirect;
+ redirect = NULL;
+ }
+ spin_unlock(&redirect_lock);
+ if (f)
+ fput(f);
check_tty_count(tty, "do_tty_hangup");
file_list_lock();
@@ -743,7 +749,7 @@
{
int is_console;
struct tty_struct * tty;
- struct inode *inode;
+ struct inode *inode = file->f_dentry->d_inode;
/* Can't seek (pwrite) on ttys. */
if (ppos != &file->f_pos)
@@ -757,10 +763,24 @@
is_console = (inode->i_rdev == SYSCONS_DEV ||
inode->i_rdev == CONSOLE_DEV);
- if (is_console && redirect)
- tty = redirect;
- else
- tty = (struct tty_struct *)file->private_data;
+ if (is_console) {
+ struct file *p = NULL;
+
+ spin_lock(&redirect_lock);
+ if (redirect) {
+ get_file(redirect);
+ p = redirect;
+ }
+ spin_unlock(&redirect_lock);
+
+ if (p) {
+ ssize_t res = p->f_op->write(p, buf, count, &p->f_pos);
+ fput(p);
+ return res;
+ }
+ }
+
+ tty = (struct tty_struct *)file->private_data;
if (tty_paranoia_check(tty, inode->i_rdev, "tty_write"))
return -EIO;
if (!tty || !tty->driver.write || (test_bit(TTY_IO_ERROR, &tty->flags)))
@@ -1223,7 +1243,7 @@
/*
* If _either_ side is closing, make sure there aren't any
* processes that still think tty or o_tty is their controlling
- * tty. Also, clear redirect if it points to either tty.
+ * tty.
*/
if (tty_closing || o_tty_closing) {
struct task_struct *p;
@@ -1234,9 +1254,6 @@
p->tty = NULL;
}
read_unlock(&tasklist_lock);
-
- if (redirect == tty || (o_tty && redirect == o_tty))
- redirect = NULL;
}
/* check whether both sides are closing ... */
@@ -1515,19 +1532,29 @@
return 0;
}
-static int tioccons(struct inode *inode,
- struct tty_struct *tty, struct tty_struct *real_tty)
+static int tioccons(struct inode *inode, struct file *file)
{
if (inode->i_rdev == SYSCONS_DEV ||
inode->i_rdev == CONSOLE_DEV) {
+ struct file *f;
if (!suser())
return -EPERM;
+ spin_lock(&redirect_lock);
+ f = redirect;
redirect = NULL;
+ spin_unlock(&redirect_lock);
+ if (f)
+ fput(f);
return 0;
}
- if (redirect)
+ spin_lock(&redirect_lock);
+ if (redirect) {
+ spin_unlock(&redirect_lock);
return -EBUSY;
- redirect = real_tty;
+ }
+ get_file(file);
+ redirect = file;
+ spin_unlock(&redirect_lock);
return 0;
}
@@ -1747,7 +1774,7 @@
case TIOCSWINSZ:
return tiocswinsz(tty, real_tty, (struct winsize *) arg);
case TIOCCONS:
- return tioccons(inode, tty, real_tty);
+ return real_tty!=tty ? -EINVAL : tioccons(inode, file);
case FIONBIO:
return fionbio(file, (int *) arg);
case TIOCEXCL:
|
|
From: <ai...@us...> - 2003-09-27 09:22:14
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-ia64 In directory sc8-pr-cvs1:/tmp/cvs-serv26117/include/asm-ia64 Removed Files: offsets.h Log Message: Merge 2.4.21 - build fixes --- offsets.h DELETED --- |
|
From: <ai...@us...> - 2003-09-27 09:22:14
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/video
In directory sc8-pr-cvs1:/tmp/cvs-serv26117/drivers/video
Modified Files:
Config.in Makefile fbmem.c
Log Message:
Merge 2.4.21 - build fixes
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/Config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Config.in 27 Sep 2003 07:43:28 -0000 1.6
+++ Config.in 27 Sep 2003 09:21:18 -0000 1.7
@@ -80,7 +80,7 @@
bool ' Generic STI frame buffer device support' CONFIG_FB_STI
fi
if [ "$CONFIG_MAC" = "y" ]; then
- define_bool CONFIG_FB_MAC y
+ bool ' Generic Macintosh display support' CONFIG_FB_MAC
bool ' Apple "valkyrie" display support' CONFIG_FB_VALKYRIE
# bool ' Apple DAFB display support' CONFIG_FB_DAFB
fi
@@ -124,14 +124,20 @@
if [ "$CONFIG_FB_MATROX" != "n" ]; then
bool ' Millennium I/II support' CONFIG_FB_MATROX_MILLENIUM
bool ' Mystique support' CONFIG_FB_MATROX_MYSTIQUE
- bool ' G100/G200/G400/G450/G550 support' CONFIG_FB_MATROX_G100
+ bool ' G100/G200/G400/G450/G550 support' CONFIG_FB_MATROX_G450
+ if [ "$CONFIG_FB_MATROX_G450" = "n" ]; then
+ bool ' G100/G200/G400 support' CONFIG_FB_MATROX_G100A
+ fi
+ if [ "$CONFIG_FB_MATROX_G450" = "y" -o "$CONFIG_FB_MATROX_G100A" = "y" ]; then
+ define_bool CONFIG_FB_MATROX_G100 y
+ fi
if [ "$CONFIG_I2C" != "n" ]; then
dep_tristate ' Matrox I2C support' CONFIG_FB_MATROX_I2C $CONFIG_FB_MATROX $CONFIG_I2C_ALGOBIT
if [ "$CONFIG_FB_MATROX_G100" = "y" ]; then
dep_tristate ' G400 second head support' CONFIG_FB_MATROX_MAVEN $CONFIG_FB_MATROX_I2C
fi
fi
- dep_tristate ' G450/G550 second head support (mandatory for G550)' CONFIG_FB_MATROX_G450 $CONFIG_FB_MATROX_G100
+ dep_tristate ' Matrox /proc interface' CONFIG_FB_MATROX_PROC $CONFIG_FB_MATROX
bool ' Multihead support' CONFIG_FB_MATROX_MULTIHEAD
fi
tristate ' ATI Mach64 display support (EXPERIMENTAL)' CONFIG_FB_ATY
@@ -141,6 +147,7 @@
fi
tristate ' ATI Radeon display support (EXPERIMENTAL)' CONFIG_FB_RADEON
tristate ' ATI Rage128 display support (EXPERIMENTAL)' CONFIG_FB_ATY128
+ tristate ' Intel 830M/845G/852GM/855GM/865G display support (EXPERIMENTAL)' CONFIG_FB_INTEL
tristate ' SIS acceleration (EXPERIMENTAL)' CONFIG_FB_SIS
if [ "$CONFIG_FB_SIS" != "n" ]; then
bool ' SIS 630/540/730 support' CONFIG_FB_SIS_300
@@ -295,7 +302,8 @@
"$CONFIG_FB_PMAG_BA" = "y" -o "$CONFIG_FB_PMAGB_B" = "y" -o \
"$CONFIG_FB_MAXINE" = "y" -o "$CONFIG_FB_TX3912" = "y" -o \
"$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_NEOMAGIC" = "y" -o \
- "$CONFIG_FB_STI" = "y" -o "$CONFIG_FB_HP300" = "y" ]; then
+ "$CONFIG_FB_STI" = "y" -o "$CONFIG_FB_HP300" = "y" -o \
+ "$CONFIG_FB_INTEL" = "y" ]; then
define_tristate CONFIG_FBCON_CFB8 y
else
if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \
@@ -317,7 +325,7 @@
"$CONFIG_FB_MAXINE" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
"$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
"$CONFIG_FB_TX3912" = "m" -o "$CONFIG_FB_NEOMAGIC" = "m" -o \
- "$CONFIG_FB_STI" = "m" ]; then
+ "$CONFIG_FB_STI" = "m" -o "$CONFIG_FB_INTEL" = "m" ]; then
define_tristate CONFIG_FBCON_CFB8 m
fi
fi
@@ -335,7 +343,7 @@
"$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
"$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" -o \
"$CONFIG_FB_PVR2" = "y" -o "$CONFIG_FB_VOODOO1" = "y" -o \
- "$CONFIG_FB_NEOMAGIC" = "y" ]; then
+ "$CONFIG_FB_NEOMAGIC" = "y" -o "$CONFIG_FB_INTEL" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 y
else
if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
@@ -352,7 +360,7 @@
"$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
"$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
"$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" -o \
- "$CONFIG_FB_NEOMAGIC" = "m" ]; then
+ "$CONFIG_FB_NEOMAGIC" = "m" -o "$CONFIG_FB_INTEL" = "m" ]; then
define_tristate CONFIG_FBCON_CFB16 m
fi
fi
@@ -384,7 +392,7 @@
"$CONFIG_FB_RADEON" = "y" -o "$CONFIG_FB_PVR2" = "y" -o \
"$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_SIS" = "y" -o \
"$CONFIG_FB_VOODOO1" = "y" -o "$CONFIG_FB_CYBER2000" = "y" -o \
- "$CONFIG_FB_STI" = "y" ]; then
+ "$CONFIG_FB_STI" = "y" -o "$CONFIG_FB_INTEL" = "y" ]; then
define_tristate CONFIG_FBCON_CFB32 y
else
if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
@@ -397,7 +405,8 @@
"$CONFIG_FB_3DFX" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
"$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
"$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" -o \
- "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_STI" = "y" ]; then
+ "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_STI" = "y" -o \
+ "$CONFIG_FB_INTEL" = "m" ]; then
define_tristate CONFIG_FBCON_CFB32 m
fi
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 27 Sep 2003 07:43:28 -0000 1.6
+++ Makefile 27 Sep 2003 09:21:19 -0000 1.7
@@ -103,6 +103,11 @@
obj-y += matrox/matrox.o
endif
+subdir-$(CONFIG_FB_INTEL) += intel
+ifeq ($(CONFIG_FB_INTEL),y)
+obj-y += intel/intelfb.o
+endif
+
subdir-$(CONFIG_FB_RIVA) += riva
ifeq ($(CONFIG_FB_RIVA),y)
obj-y += riva/rivafb.o
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/video/fbmem.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fbmem.c 27 Sep 2003 07:43:28 -0000 1.7
+++ fbmem.c 27 Sep 2003 09:21:19 -0000 1.8
@@ -130,6 +130,8 @@
extern int tx3912fb_init(void);
extern int radeonfb_init(void);
extern int radeonfb_setup(char*);
+extern int intelfb_init(void);
+extern int intelfb_setup(char*);
extern int e1355fb_init(void);
extern int e1355fb_setup(char*);
extern int au1100fb_init(void);
@@ -201,6 +203,9 @@
#ifdef CONFIG_FB_RADEON
{ "radeon", radeonfb_init, radeonfb_setup },
#endif
+#ifdef CONFIG_FB_INTEL
+ { "intelfb", intelfb_init, intelfb_setup },
+#endif
#ifdef CONFIG_FB_CONTROL
{ "controlfb", control_init, control_setup },
#endif
@@ -651,6 +656,8 @@
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
#elif defined(__sh__)
pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE;
+#elif defined(__hppa__)
+ pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
#elif defined(__ia64__)
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
#elif defined(__hppa__)
|
|
From: <ai...@us...> - 2003-09-27 09:22:14
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv26117/include/asm-vax
Modified Files:
processor.h unistd.h
Log Message:
Merge 2.4.21 - build fixes
Index: processor.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/processor.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- processor.h 3 Feb 2003 00:09:31 -0000 1.12
+++ processor.h 27 Sep 2003 09:21:19 -0000 1.13
@@ -91,7 +91,7 @@
}
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+extern int arch_kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
#define copy_segments(tsk, mm) do { } while (0)
#define release_segments(mm) do { } while (0)
Index: unistd.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/unistd.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- unistd.h 12 Feb 2003 02:37:33 -0000 1.13
+++ unistd.h 27 Sep 2003 09:21:19 -0000 1.14
@@ -460,7 +460,7 @@
#include <linux/signal.h>
-extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
+extern pid_t arch_kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
#define __NR__exit __NR_exit
static inline _syscall0(int,sync)
|
|
From: <ai...@us...> - 2003-09-27 09:22:14
|
Update of /cvsroot/linux-vax/kernel-2.4/fs/proc
In directory sc8-pr-cvs1:/tmp/cvs-serv26117/fs/proc
Modified Files:
array.c
Log Message:
Merge 2.4.21 - build fixes
Index: array.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/proc/array.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- array.c 21 Sep 2003 13:12:31 -0000 1.4
+++ array.c 27 Sep 2003 09:21:19 -0000 1.5
@@ -567,6 +567,8 @@
line = d_path(map->vm_file->f_dentry,
map->vm_file->f_vfsmnt,
buf, PAGE_SIZE);
+ if (IS_ERR(line))
+ return PTR_ERR(line);
buf[PAGE_SIZE-1] = '\n';
line -= MAPS_LINE_MAX;
if(line < buf)
@@ -640,6 +642,8 @@
goto next;
}
len = proc_pid_maps_get_line(tmp, map);
+ if (len < 0)
+ goto out_unlock;
len -= off;
if (len > 0) {
if (retval+len > count) {
@@ -661,6 +665,8 @@
if (loff) BUG();
map = map->vm_next;
}
+
+out_unlock:
up_read(&mm->mmap_sem);
mmput(mm);
|
