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-07-09 23:10:20
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv29561/include/asm-vax Modified Files: current.h system.h thread_info.h Log Message: Merge with 2.5.51 Index: current.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/current.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- current.h 16 Feb 2003 00:13:16 -0000 1.5 +++ current.h 9 Jul 2003 23:10:17 -0000 1.6 @@ -1,7 +1,7 @@ #ifndef _VAX_CURRENT_H #define _VAX_CURRENT_H -#include <asm/thread_info.h> +#include <linux/thread_info.h> struct task_struct; Index: system.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/system.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- system.h 11 May 2003 17:43:36 -0000 1.12 +++ system.h 9 Jul 2003 23:10:17 -0000 1.13 @@ -68,6 +68,7 @@ #define mb() __asm__ __volatile__("": : :"memory") #define rmb() mb() #define wmb() mb() +#define read_barrier_depends() mb() #define set_mb(var, value) do { var = value; mb(); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) Index: thread_info.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/thread_info.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thread_info.h 12 Dec 2002 01:15:44 -0000 1.2 +++ thread_info.h 9 Jul 2003 23:10:17 -0000 1.3 @@ -34,6 +34,7 @@ 0-0x7FFFFFFF for user-thead 0-0xFFFFFFFF for kernel-thread */ + struct restart_block restart_block; unsigned char supervisor_stack[0]; }; @@ -57,11 +58,14 @@ #ifndef __ASSEMBLY__ #define INIT_THREAD_INFO(tsk) \ { \ - task: &tsk, \ - exec_domain: &default_exec_domain, \ - flags: 0, \ - cpu: 0, \ - addr_limit: KERNEL_DS, \ + .task = &tsk, \ + .exec_domain = &default_exec_domain, \ + .flags = 0, \ + .cpu = 0, \ + .addr_limit = KERNEL_DS, \ + .restart_block = { \ + .fn = do_no_restart_syscall, \ + } \ } #define init_thread_info (init_thread_union.thread_info) |
From: Kenn H. <ke...@us...> - 2003-07-09 23:10:20
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv29561/arch/vax/kernel Modified Files: signal.c Log Message: Merge with 2.5.51 Index: signal.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/signal.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- signal.c 19 Mar 2003 00:47:06 -0000 1.9 +++ signal.c 9 Jul 2003 23:10:17 -0000 1.10 @@ -563,6 +563,10 @@ if (canrestart) { /* If so, check system call restarting.. */ switch (regs->r0) { + case -ERESTART_RESTARTBLOCK: + current_thread_info()->restart_block.fn = do_no_restart_syscall; + /* fallthrough */ + case -ERESTARTNOHAND: /* ERESTARTNOHAND means that the syscall should only be restarted if there was no handler for the signal, and since |
From: Kenn H. <ke...@us...> - 2003-07-07 23:48:13
|
Update of /cvsroot/linux-vax/kernel-2.5/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv31535/scripts Modified Files: Makefile.build Removed Files: kallsyms Log Message: Merge with 2.5.51 Index: Makefile.build =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.build 19 Jun 2003 23:31:48 -0000 1.4 +++ Makefile.build 7 Jul 2003 23:48:09 -0000 1.5 @@ -40,12 +40,14 @@ ifdef L_TARGET L_TARGET := $(obj)/$(L_TARGET) else +ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-)),) O_TARGET := $(obj)/built-in.o endif +endif __build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \ - $(if $(KBUILD_MODULES),$(obj-m)) \ - $(subdir-ym) + $(if $(KBUILD_MODULES),$(obj-m:.o=.ko)) \ + $(subdir-ym) $(build-targets) @: # Compile C sources (.c) @@ -106,7 +108,9 @@ $(call if_changed_dep,cc_o_c) quiet_cmd_cc_lst_c = MKLST $@ -cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && sh scripts/makelst $*.o System.map $(OBJDUMP) > $@ + cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \ + $(CONFIG_SHELL) $(src)/scripts/makelst $*.o \ + System.map $(OBJDUMP) > $@ %.lst: %.c FORCE $(call if_changed_dep,cc_lst_c) @@ -119,9 +123,6 @@ $(real-objs-m) : modkern_aflags := $(AFLAGS_MODULE) $(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE) -a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \ - $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) - quiet_cmd_as_s_S = CPP $(quiet_modtag) $@ cmd_as_s_S = $(CPP) $(a_flags) -o $@ $< @@ -174,21 +175,29 @@ # # Rule to link composite objects # +quiet_cmd_link_multi-y = LD $@ +cmd_link_multi-y = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(addprefix $(obj)/,$($(subst $(obj)/,,$(@:.o=-objs))) $($(subst $(obj)/,,$(@:.o=-y)))),$^) -quiet_cmd_link_multi = LD $(quiet_modtag) $@ -cmd_link_multi = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(addprefix $(obj)/,$($(subst $(obj)/,,$(@:.o=-objs))) $($(subst $(obj)/,,$(@:.o=-y)))),$^) +quiet_cmd_link_multi-m = LD [M] $@ +cmd_link_multi-m = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_MODULE) -o $@ $(filter $(addprefix $(obj)/,$($(subst $(obj)/,,$(@:.ko=-objs))) $($(subst $(obj)/,,$(@:.ko=-y)))),$^) + +quiet_cmd_link_single-m = LD [M] $@ +cmd_link_single-m = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_MODULE) -o $@ $< # We would rather have a list of rules like # foo.o: $(foo-objs) # but that's not so easy, so we rather make all composite objects depend # on the set of all their parts $(multi-used-y) : %.o: $(multi-objs-y) FORCE - $(call if_changed,link_multi) + $(call if_changed,link_multi-y) + +$(multi-used-m:.o=.ko) : %.ko: $(multi-objs-m) FORCE + $(call if_changed,link_multi-m) -$(multi-used-m) : %.o: $(multi-objs-m) FORCE - $(call if_changed,link_multi) +$(single-used-m:.o=.ko) : %.ko: %.o FORCE + $(call if_changed,link_single-m) -targets += $(multi-used-y) $(multi-used-m) +targets += $(multi-used-y) $(multi-used-m:.o=.ko) $(single-used-m:.o=.ko) # Compile programs on the host # =========================================================================== @@ -220,9 +229,7 @@ # Create executable from a single .c file # host-csingle -> Executable quiet_cmd_host-csingle = HOSTCC $@ - cmd_host-csingle = $(HOSTCC) -Wp,-MD,$(depfile) \ - $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ - $(HOST_LOADLIBES) -o $@ $< + cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(HOST_LOADLIBES) -o $@ $< $(host-csingle): %: %.c FORCE $(call if_changed_dep,host-csingle) @@ -238,9 +245,7 @@ # Create .o file from a single .c file # host-cobjs -> .o quiet_cmd_host-cobjs = HOSTCC $@ - cmd_host-cobjs = $(HOSTCC) -Wp,-MD,$(depfile) \ - $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ - $(HOSTCFLAGS_$(@F)) -c -o $@ $< + cmd_host-cobjs = $(HOSTCC) $(hostc_flags) -c -o $@ $< $(host-cobjs): %.o: %.c FORCE $(call if_changed_dep,host-cobjs) @@ -256,18 +261,14 @@ # Create .o file from a single .cc (C++) file quiet_cmd_host-cxxobjs = HOSTCXX $@ - cmd_host-cxxobjs = $(HOSTCXX) -Wp,-MD,$(depfile) \ - $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ - $(HOSTCXXFLAGS_$(@F)) -c -o $@ $< + cmd_host-cxxobjs = $(HOSTCXX) $(hostcxx_flags) -c -o $@ $< $(host-cxxobjs): %.o: %.cc FORCE $(call if_changed_dep,host-cxxobjs) # Compile .c file, create position independent .o file # host-cshobjs -> .o quiet_cmd_host-cshobjs = HOSTCC -fPIC $@ - cmd_host-cshobjs = $(HOSTCC) -Wp,-MD,$(depfile) -fPIC\ - $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ - $(HOSTCFLAGS_$(@F)) -c -o $@ $< + cmd_host-cshobjs = $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $< $(host-cshobjs): %.o: %.c FORCE $(call if_changed_dep,host-cshobjs) --- kallsyms DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:48:12
|
Update of /cvsroot/linux-vax/kernel-2.5/init In directory sc8-pr-cvs1:/tmp/cvs-serv31535/init Modified Files: do_mounts.c Log Message: Merge with 2.5.51 Index: do_mounts.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/init/do_mounts.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- do_mounts.c 26 Jun 2003 23:07:10 -0000 1.4 +++ do_mounts.c 7 Jul 2003 23:48:09 -0000 1.5 @@ -597,7 +597,7 @@ #ifdef CONFIG_BLK_DEV_RAM int in_fd, out_fd; unsigned long rd_blocks, devblocks; - int nblocks, i; + int nblocks, i, disk; char *buf; unsigned short rotate = 0; #if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES) @@ -640,7 +640,7 @@ rd_blocks >>= 1; if (nblocks > rd_blocks) { - printk("RAMDISK: image too big! (%d/%d blocks)\n", + printk("RAMDISK: image too big! (%d/%ld blocks)\n", nblocks, rd_blocks); goto done; } @@ -667,23 +667,23 @@ goto done; } - printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%d disk%s] into ram disk... ", + printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%ld disk%s] into ram disk... ", nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : ""); - for (i=0; i < nblocks; i++) { + for (i = 0, disk = 1; i < nblocks; i++) { if (i && (i % devblocks == 0)) { - printk("done disk #%d.\n", i/devblocks); + printk("done disk #%d.\n", disk++); rotate = 0; if (close(in_fd)) { printk("Error closing the disk.\n"); goto noclose_input; } - change_floppy("disk #%d", i/devblocks+1); + change_floppy("disk #%d", disk); in_fd = open(from, O_RDONLY, 0); if (in_fd < 0) { printk("Error opening disk.\n"); goto noclose_input; } - printk("Loading disk #%d... ", i/devblocks+1); + printk("Loading disk #%d... ", disk); } read(in_fd, buf, BLOCK_SIZE); write(out_fd, buf, BLOCK_SIZE); @@ -920,6 +920,7 @@ static unsigned inptr; /* index of next byte to be processed in inbuf */ static unsigned outcnt; /* bytes in output buffer */ static int exit_code; +static int unzip_error; static long bytes_out; static int crd_infd, crd_outfd; @@ -967,13 +968,17 @@ /* =========================================================================== * Fill the input buffer. This is called only when the buffer is empty * and at least one byte is really needed. + * Returning -1 does not guarantee that gunzip() will ever return. */ static int __init fill_inbuf(void) { if (exit_code) return -1; insize = read(crd_infd, inbuf, INBUFSIZ); - if (insize == 0) return -1; + if (insize == 0) { + error("RAMDISK: ran out of compressed data\n"); + return -1; + } inptr = 1; @@ -987,10 +992,15 @@ static void __init flush_window(void) { ulg c = crc; /* temporary variable */ - unsigned n; + unsigned n, written; uch *in, ch; - write(crd_outfd, window, outcnt); + written = write(crd_outfd, window, outcnt); + if (written != outcnt && unzip_error == 0) { + printk(KERN_ERR "RAMDISK: incomplete write (%d != %d) %ld\n", + written, outcnt, bytes_out); + unzip_error = 1; + } in = window; for (n = 0; n < outcnt; n++) { ch = *in++; @@ -1005,6 +1015,7 @@ { printk(KERN_ERR "%s", x); exit_code = 1; + unzip_error = 1; } static int __init crd_load(int in_fd, int out_fd) @@ -1033,6 +1044,8 @@ } makecrc(); result = gunzip(); + if (unzip_error) + result = 1; kfree(inbuf); kfree(window); return result; |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:35
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/scsi Modified Files: Makefile scsi_ioctl.c Log Message: Merge with 2.5.51 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile 19 Jun 2003 23:31:47 -0000 1.16 +++ Makefile 7 Jul 2003 23:47:31 -0000 1.17 @@ -129,7 +129,8 @@ obj-$(CONFIG_CHR_DEV_SG) += sg.o scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \ - scsi_error.o scsi_lib.o scsi_scan.o scsi_syms.o + scsi_error.o scsi_lib.o scsi_scan.o scsi_syms.o \ + scsi_sysfs.o ifdef CONFIG_PROC_FS scsi_mod-objs += scsi_proc.o Index: scsi_ioctl.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scsi_ioctl.c 26 Mar 2003 00:06:47 -0000 1.10 +++ scsi_ioctl.c 7 Jul 2003 23:47:31 -0000 1.11 @@ -394,12 +394,13 @@ * any copy_to_user() error on failure there */ static int -scsi_ioctl_get_pci(Scsi_Device * dev, void *arg) +scsi_ioctl_get_pci(Scsi_Device * sdev, void *arg) { + struct device *dev = scsi_get_device(sdev->host); - if (!dev->host->pci_dev) return -ENXIO; - return copy_to_user(arg, dev->host->pci_dev->slot_name, - sizeof(dev->host->pci_dev->slot_name)); + if (!dev) return -ENXIO; + return copy_to_user(arg, dev->bus_id, + sizeof(dev->bus_id)); } #else static int |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:35
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux In directory sc8-pr-cvs1:/tmp/cvs-serv31393/include/linux Modified Files: elf.h Log Message: Merge with 2.5.51 Index: elf.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- elf.h 22 Jun 2003 16:18:54 -0000 1.7 +++ elf.h 7 Jul 2003 23:47:32 -0000 1.8 @@ -450,6 +450,37 @@ /* Keep this the last entry. */ #define R_390_NUM 27 +/* s390 relocations defined by the ABIs */ +#define R_390_NONE 0 /* No reloc. */ +#define R_390_8 1 /* Direct 8 bit. */ +#define R_390_12 2 /* Direct 12 bit. */ +#define R_390_16 3 /* Direct 16 bit. */ +#define R_390_32 4 /* Direct 32 bit. */ +#define R_390_PC32 5 /* PC relative 32 bit. */ +#define R_390_GOT12 6 /* 12 bit GOT offset. */ +#define R_390_GOT32 7 /* 32 bit GOT offset. */ +#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */ +#define R_390_COPY 9 /* Copy symbol at runtime. */ +#define R_390_GLOB_DAT 10 /* Create GOT entry. */ +#define R_390_JMP_SLOT 11 /* Create PLT entry. */ +#define R_390_RELATIVE 12 /* Adjust by program base. */ +#define R_390_GOTOFF 13 /* 32 bit offset to GOT. */ +#define R_390_GOTPC 14 /* 32 bit PC relative offset to GOT. */ +#define R_390_GOT16 15 /* 16 bit GOT offset. */ +#define R_390_PC16 16 /* PC relative 16 bit. */ +#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */ +#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */ +#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */ +#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */ +#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */ +#define R_390_64 22 /* Direct 64 bit. */ +#define R_390_PC64 23 /* PC relative 64 bit. */ +#define R_390_GOT64 24 /* 64 bit GOT offset. */ +#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */ +#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */ +/* Keep this the last entry. */ +#define R_390_NUM 27 + /* Legal values for e_flags field of Elf64_Ehdr. */ #define EF_ALPHA_32BIT 1 /* All addresses are below 2GB */ |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:34
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv31393 Modified Files: Makefile Log Message: Merge with 2.5.51 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- Makefile 26 Jun 2003 23:08:06 -0000 1.58 +++ Makefile 7 Jul 2003 23:47:31 -0000 1.59 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 50 +SUBLEVEL = 51 EXTRAVERSION = # *DOCUMENTATION* @@ -162,22 +162,21 @@ MODFLAGS = -DMODULE CFLAGS_MODULE = $(MODFLAGS) AFLAGS_MODULE = $(MODFLAGS) +LDFLAGS_MODULE = -r CFLAGS_KERNEL = AFLAGS_KERNEL = + NOSTDINC_FLAGS = -nostdinc -iwithprefix include CPPFLAGS := -D__KERNEL__ -Iinclude CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing -fno-common -ifndef CONFIG_FRAME_POINTER -CFLAGS += -fomit-frame-pointer -endif AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS) export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \ CONFIG_SHELL TOPDIR HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \ CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \ - HOSTCXX HOSTCXXFLAGS LDFLAGS_BLOB + HOSTCXX HOSTCXXFLAGS LDFLAGS_BLOB LDFLAGS_MODULE export CPPFLAGS NOSTDINC_FLAGS OBJCOPYFLAGS LDFLAGS export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE @@ -203,7 +202,7 @@ .PHONY: scripts scripts: - +@$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts + $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts # Objects we will link into vmlinux / subdirs we need to visit # --------------------------------------------------------------------------- @@ -260,6 +259,10 @@ export EXPORT_FLAGS := -DEXPORT_SYMTAB endif +ifndef CONFIG_FRAME_POINTER +CFLAGS += -fomit-frame-pointer +endif + # # INSTALL_PATH specifies where to place the updated kernel and system map # images. Uncomment if you want to place them anywhere other than root. @@ -351,12 +354,12 @@ kallsyms.o := .tmp_kallsyms2.o quiet_cmd_kallsyms = KSYM $@ -cmd_kallsyms = sh $(KALLSYMS) $< $@ +cmd_kallsyms = $(NM) -n $< | scripts/kallsyms > $@ -.tmp_kallsyms1.o: .tmp_vmlinux1 - $(call cmd,kallsyms) +.tmp_kallsyms1.o .tmp_kallsyms2.o: %.o: %.S scripts FORCE + $(call if_changed_dep,as_o_S) -.tmp_kallsyms2.o: .tmp_vmlinux2 +.tmp_kallsyms%.S: .tmp_vmlinux% $(call cmd,kallsyms) .tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/vmlinux.lds.s FORCE @@ -435,7 +438,7 @@ # with it and forgot to run make oldconfig include/linux/autoconf.h: .config - +@$(call descend,scripts/kconfig,scripts/kconfig/conf) + $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/kconfig scripts/kconfig/conf ./scripts/kconfig/conf -s arch/$(ARCH)/Kconfig # Generate some files @@ -542,7 +545,7 @@ .PHONY: $(patsubst %, _modinst_%, $(SUBDIRS)) $(patsubst %, _modinst_%, $(SUBDIRS)) : - $(Q)$(MAKE) -f scripts/Makefile.modinst obj=$(patsubst _modinst_%,%,$@) + $(Q)$(MAKE) -rR -f scripts/Makefile.modinst obj=$(patsubst _modinst_%,%,$@) else # CONFIG_MODULES # Modules not configured @@ -639,13 +642,13 @@ make_with_config scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf: scripts/fixdep FORCE - +@$(call descend,scripts/kconfig,$@) + $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/kconfig $@ xconfig: scripts/kconfig/qconf ./scripts/kconfig/qconf arch/$(ARCH)/Kconfig menuconfig: scripts/kconfig/mconf - $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts lxdialog + $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/lxdialog ./scripts/kconfig/mconf arch/$(ARCH)/Kconfig config: scripts/kconfig/conf @@ -708,9 +711,10 @@ clean: archclean $(addprefix _clean_,$(clean-dirs)) $(call cmd,rmclean) @find . $(RCS_FIND_IGNORE) \ - \( -name '*.[oas]' -o -name '.*.cmd' -o -name '.*.d' \ + \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '*.lst' \ - -o -name '.*.tmp' \) -type f -print | xargs rm -f + -o -name '.*.d' -o -name '.*.tmp' \) -type f \ + -print | xargs rm -f # mrproper - delete configuration + modules + core files # @@ -796,7 +800,7 @@ @echo '' @echo 'Execute "make" or "make all" to build all targets marked with [*] ' @echo 'For further info browse Documentation/kbuild/*' - + # Documentation targets # --------------------------------------------------------------------------- @@ -828,7 +832,7 @@ # =========================================================================== %:: FORCE - $(MAKE) $@ + $(Q)$(MAKE) $@ endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) endif # ifdef include_config @@ -842,6 +846,9 @@ quiet_cmd_as_s_S = CPP $@ cmd_as_s_S = $(CPP) $(a_flags) -o $@ $< +quiet_cmd_as_o_S = AS $@ +cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< + # read all saved command lines targets := $(wildcard $(sort $(targets))) @@ -889,6 +896,6 @@ # $(call descend,<dir>,<target>) # Recursively call a sub-make in <dir> with target <target> -descend = $(Q)$(MAKE) -f scripts/Makefile.build obj=$(1) $(2) +descend =$(Q)$(MAKE) -f scripts/Makefile.build obj=$(1) $(2) FORCE: |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:34
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/net Modified Files: Makefile Space.c Log Message: Merge with 2.5.51 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile 15 Jun 2003 23:29:22 -0000 1.19 +++ Makefile 7 Jul 2003 23:47:31 -0000 1.20 @@ -184,6 +184,10 @@ obj-$(CONFIG_MAC89x0) += mac89x0.o obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_DL2K) += dl2k.o +obj-$(CONFIG_R8169) += r8169.o + +# non-drivers/net drivers who want mii lib +obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o obj-$(CONFIG_ARCH_ACORN) += ../acorn/net/ obj-$(CONFIG_NET_FC) += fc/ Index: Space.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Space.c 21 Apr 2003 22:55:50 -0000 1.7 +++ Space.c 7 Jul 2003 23:47:31 -0000 1.8 @@ -48,7 +48,6 @@ extern int hp100_probe(struct net_device *dev); extern int ultra_probe(struct net_device *dev); extern int ultra32_probe(struct net_device *dev); -extern int ultramca_probe(struct net_device *dev); extern int wd_probe(struct net_device *dev); extern int el2_probe(struct net_device *dev); extern int ne_probe(struct net_device *dev); @@ -107,7 +106,6 @@ extern int vax_sgec_probe(struct net_device *); /* Detachable devices ("pocket adaptors") */ -extern int de600_probe(struct net_device *); extern int de620_probe(struct net_device *); /* FDDI adapters */ @@ -194,9 +192,6 @@ static struct devprobe mca_probes[] __initdata = { -#ifdef CONFIG_ULTRAMCA - {ultramca_probe, 0}, -#endif #ifdef CONFIG_NE2_MCA {ne2_probe, 0}, #endif @@ -317,9 +312,6 @@ }; static struct devprobe parport_probes[] __initdata = { -#ifdef CONFIG_DE600 /* D-Link DE-600 adapter */ - {de600_probe, 0}, -#endif #ifdef CONFIG_DE620 /* D-Link DE-620 adapter */ {de620_probe, 0}, #endif |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:34
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/include In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/acpi/include Removed Files: acdisasm.h Log Message: Merge with 2.5.51 --- acdisasm.h DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:34
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char/agp In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/char/agp Removed Files: agp.c amd-agp.c i810-agp.c i8x0-agp.c k8-agp.c Log Message: Merge with 2.5.51 --- agp.c DELETED --- --- amd-agp.c DELETED --- --- i810-agp.c DELETED --- --- i8x0-agp.c DELETED --- --- k8-agp.c DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:34
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/char Modified Files: Makefile tty_io.c Removed Files: hp_keyb.c hp_psaux.c Log Message: Merge with 2.5.51 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Makefile 26 Jun 2003 23:07:10 -0000 1.31 +++ Makefile 7 Jul 2003 23:47:31 -0000 1.32 @@ -12,7 +12,7 @@ # All of the (potential) objects that export symbols. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. -export-objs := busmouse.o vt.o generic_serial.o ip2main.o \ +export-objs := busmouse.o vt.o generic_serial.o ip2main.o consolemap.o\ ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \ selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o Index: tty_io.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- tty_io.c 22 Jun 2003 16:18:53 -0000 1.14 +++ tty_io.c 7 Jul 2003 23:47:31 -0000 1.15 @@ -372,6 +372,8 @@ return -ERESTARTSYS; } +EXPORT_SYMBOL(tty_check_change); + static ssize_t hung_up_tty_read(struct file * file, char * buf, size_t count, loff_t *ppos) { @@ -540,6 +542,8 @@ schedule_work(&tty->hangup_work); } +EXPORT_SYMBOL(tty_hangup); + void tty_vhangup(struct tty_struct * tty) { #ifdef TTY_DEBUG_HANGUP @@ -556,6 +560,8 @@ return (filp->f_op == &hung_up_tty_fops); } +EXPORT_SYMBOL(tty_hung_up_p); + /* * This function is typically called only by the session leader, when * it wants to disassociate itself from its controlling tty. @@ -1503,6 +1509,13 @@ return -EFAULT; if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg))) return 0; +#ifdef CONFIG_VT + if (tty->driver.type == TTY_DRIVER_TYPE_CONSOLE) { + unsigned int currcons = minor(tty->device) - tty->driver.minor_start; + if (vc_resize(currcons, tmp_ws.ws_col, tmp_ws.ws_row)) + return -ENXIO; + } +#endif if (tty->pgrp > 0) kill_pg(tty->pgrp, SIGWINCH, 1); if ((real_tty->pgrp != tty->pgrp) && (real_tty->pgrp > 0)) @@ -1886,6 +1899,8 @@ schedule_work(&tty->SAK_work); } +EXPORT_SYMBOL(do_SAK); + /* * This routine is called out of the software interrupt to flush data * from the flip buffer to the line discipline. @@ -1946,34 +1961,44 @@ #endif }; -static int n_baud_table = sizeof(baud_table)/sizeof(int); +static int n_baud_table = ARRAY_SIZE(baud_table); -int tty_get_baud_rate(struct tty_struct *tty) +int tty_termios_baud_rate(struct termios *termios) { - unsigned int cflag, i; + unsigned int cbaud = termios->c_cflag & CBAUD; - cflag = tty->termios->c_cflag; + if (cbaud & CBAUDEX) { + cbaud &= ~CBAUDEX; - i = cflag & CBAUD; - if (i & CBAUDEX) { - i &= ~CBAUDEX; - if (i < 1 || i+15 >= n_baud_table) - tty->termios->c_cflag &= ~CBAUDEX; + if (cbaud < 1 || cbaud + 15 > n_baud_table) + termios->c_cflag &= ~CBAUDEX; else - i += 15; + cbaud += 15; } - if (i==15 && tty->alt_speed) { + + return baud_table[cbaud]; +} + +EXPORT_SYMBOL(tty_termios_baud_rate); + +int tty_get_baud_rate(struct tty_struct *tty) +{ + int baud = tty_termios_baud_rate(tty->termios); + + if (baud == 38400 && tty->alt_speed) { if (!tty->warned) { printk(KERN_WARNING "Use of setserial/setrocket to " "set SPD_* flags is deprecated\n"); tty->warned = 1; } - return(tty->alt_speed); + baud = tty->alt_speed; } - return baud_table[i]; + return baud; } +EXPORT_SYMBOL(tty_get_baud_rate); + void tty_flip_buffer_push(struct tty_struct *tty) { if (tty->low_latency) @@ -2206,7 +2231,7 @@ #ifdef CONFIG_TN3270_CONSOLE tub3270_con_init(); #endif -#ifdef CONFIG_TN3215 +#ifdef CONFIG_TN3215_CONSOLE con3215_init(); #endif #ifdef CONFIG_SCLP_CONSOLE @@ -2347,10 +2372,7 @@ #ifdef CONFIG_TN3270 tub3270_init(); #endif -#ifdef CONFIG_TN3215 - tty3215_init(); -#endif -#ifdef CONFIG_SCLP +#ifdef CONFIG_SCLP_TTY sclp_tty_init(); #endif #ifdef CONFIG_A2232 --- hp_keyb.c DELETED --- --- hp_psaux.c DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:47:34
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers Modified Files: Makefile Log Message: Merge with 2.5.51 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile 26 Jun 2003 23:05:54 -0000 1.16 +++ Makefile 7 Jul 2003 23:47:31 -0000 1.17 @@ -21,7 +21,7 @@ obj-$(CONFIG_SCSI) += scsi/ obj-$(CONFIG_FUSION) += message/ obj-$(CONFIG_IEEE1394) += ieee1394/ -obj-y += cdrom/ +obj-y += cdrom/ video/ obj-$(CONFIG_MTD) += mtd/ obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_DIO) += dio/ @@ -30,7 +30,6 @@ obj-$(CONFIG_ALL_PPC) += macintosh/ obj-$(CONFIG_MAC) += macintosh/ obj-$(CONFIG_SGI) += sgi/ -obj-$(CONFIG_VT) += video/ obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_USB) += usb/ @@ -44,6 +43,7 @@ obj-$(CONFIG_BT) += bluetooth/ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ obj-$(CONFIG_ISDN_BOOL) += isdn/ +obj-$(CONFIG_MCA) += mca/ # VAX-specific stuff obj-$(CONFIG_VAX) += vax/ |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:22
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-s390x In directory sc8-pr-cvs1:/tmp/cvs-serv30451/include/asm-s390x Removed Files: chandev.h s390dyn.h s390io.h s390mach.h Log Message: Merge with 2.5.51 --- chandev.h DELETED --- --- s390dyn.h DELETED --- --- s390io.h DELETED --- --- s390mach.h DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.5/include/video In directory sc8-pr-cvs1:/tmp/cvs-serv30451/include/video Removed Files: fbcon-afb.h fbcon-cfb16.h fbcon-cfb2.h fbcon-cfb24.h fbcon-cfb32.h fbcon-cfb4.h fbcon-cfb8.h fbcon-hga.h fbcon-ilbm.h fbcon-iplan2p2.h fbcon-iplan2p4.h fbcon-iplan2p8.h fbcon-mac.h fbcon-mfb.h fbcon-vga-planes.h fbcon-vga.h fbcon.h font.h macmodes.h Log Message: Merge with 2.5.51 --- fbcon-afb.h DELETED --- --- fbcon-cfb16.h DELETED --- --- fbcon-cfb2.h DELETED --- --- fbcon-cfb24.h DELETED --- --- fbcon-cfb32.h DELETED --- --- fbcon-cfb4.h DELETED --- --- fbcon-cfb8.h DELETED --- --- fbcon-hga.h DELETED --- --- fbcon-ilbm.h DELETED --- --- fbcon-iplan2p2.h DELETED --- --- fbcon-iplan2p4.h DELETED --- --- fbcon-iplan2p8.h DELETED --- --- fbcon-mac.h DELETED --- --- fbcon-mfb.h DELETED --- --- fbcon-vga-planes.h DELETED --- --- fbcon-vga.h DELETED --- --- fbcon.h DELETED --- --- font.h DELETED --- --- macmodes.h DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:21
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-s390 In directory sc8-pr-cvs1:/tmp/cvs-serv30451/include/asm-s390 Removed Files: chandev.h s390dyn.h s390io.h s390mach.h Log Message: Merge with 2.5.51 --- chandev.h DELETED --- --- s390dyn.h DELETED --- --- s390io.h DELETED --- --- s390mach.h DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.5/drivers/video In directory sc8-pr-cvs1:/tmp/cvs-serv30451/drivers/video Removed Files: dummycon.c fbcon-accel.c fbcon-accel.h fbcon-afb.c fbcon-cfb16.c fbcon-cfb2.c fbcon-cfb24.c fbcon-cfb32.c fbcon-cfb4.c fbcon-cfb8.c fbcon-hga.c fbcon-ilbm.c fbcon-iplan2p2.c fbcon-iplan2p4.c fbcon-iplan2p8.c fbcon-mfb.c fbcon-sti.c fbcon-vga-planes.c fbcon.c fbgen.c font_6x11.c font_8x16.c font_8x8.c font_acorn_8x8.c font_mini_4x6.c font_pearl_8x8.c font_sun12x22.c font_sun8x16.c fonts.c iga.h mdacon.c newport_con.c prom.uni promcon.c radeon.h sti-bmode.h sti.h sticon-bmode.c sticon.c sticore.c vga.h vgacon.c Log Message: Merge with 2.5.51 --- dummycon.c DELETED --- --- fbcon-accel.c DELETED --- --- fbcon-accel.h DELETED --- --- fbcon-afb.c DELETED --- --- fbcon-cfb16.c DELETED --- --- fbcon-cfb2.c DELETED --- --- fbcon-cfb24.c DELETED --- --- fbcon-cfb32.c DELETED --- --- fbcon-cfb4.c DELETED --- --- fbcon-cfb8.c DELETED --- --- fbcon-hga.c DELETED --- --- fbcon-ilbm.c DELETED --- --- fbcon-iplan2p2.c DELETED --- --- fbcon-iplan2p4.c DELETED --- --- fbcon-iplan2p8.c DELETED --- --- fbcon-mfb.c DELETED --- --- fbcon-sti.c DELETED --- --- fbcon-vga-planes.c DELETED --- --- fbcon.c DELETED --- --- fbgen.c DELETED --- --- font_6x11.c DELETED --- --- font_8x16.c DELETED --- --- font_8x8.c DELETED --- --- font_acorn_8x8.c DELETED --- --- font_mini_4x6.c DELETED --- --- font_pearl_8x8.c DELETED --- --- font_sun12x22.c DELETED --- --- font_sun8x16.c DELETED --- --- fonts.c DELETED --- --- iga.h DELETED --- --- mdacon.c DELETED --- --- newport_con.c DELETED --- --- prom.uni DELETED --- --- promcon.c DELETED --- --- radeon.h DELETED --- --- sti-bmode.h DELETED --- --- sti.h DELETED --- --- sticon-bmode.c DELETED --- --- sticon.c DELETED --- --- sticore.c DELETED --- --- vga.h DELETED --- --- vgacon.c DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:20
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/s390/misc In directory sc8-pr-cvs1:/tmp/cvs-serv30451/drivers/s390/misc Removed Files: chandev.c Log Message: Merge with 2.5.51 --- chandev.c DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:20
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/riva In directory sc8-pr-cvs1:/tmp/cvs-serv30451/drivers/video/riva Removed Files: accel.c Log Message: Merge with 2.5.51 --- accel.c DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.5/drivers/s390/cio In directory sc8-pr-cvs1:/tmp/cvs-serv30451/drivers/s390/cio Removed Files: cio_debug.c ioinfo.c ioinfo.h misc.c misc.h proc.c proc.h s390io.c s390io.h Log Message: Merge with 2.5.51 --- cio_debug.c DELETED --- --- ioinfo.c DELETED --- --- ioinfo.h DELETED --- --- misc.c DELETED --- --- misc.h DELETED --- --- proc.c DELETED --- --- proc.h DELETED --- --- s390io.c DELETED --- --- s390io.h DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:17
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/parisc/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv30451/arch/parisc/kernel Removed Files: keyboard.c Log Message: Merge with 2.5.51 --- keyboard.c DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:17
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/s390/block In directory sc8-pr-cvs1:/tmp/cvs-serv30451/drivers/s390/block Removed Files: dasd_3370_erp.h dasd_3990_erp.h dasd_9336_erp.h dasd_9343_erp.h Log Message: Merge with 2.5.51 --- dasd_3370_erp.h DELETED --- --- dasd_3990_erp.h DELETED --- --- dasd_9336_erp.h DELETED --- --- dasd_9343_erp.h DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:17
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/s390/char In directory sc8-pr-cvs1:/tmp/cvs-serv30451/drivers/s390/char Removed Files: tape3480.c tape3480.h tape3490.c tape3490.h tape34xx.c tape34xx.h tape_idalbuf.h tapeblock.c tapeblock.h tapechar.c tapechar.h tapedefs.h Log Message: Merge with 2.5.51 --- tape3480.c DELETED --- --- tape3480.h DELETED --- --- tape3490.c DELETED --- --- tape3490.h DELETED --- --- tape34xx.c DELETED --- --- tape34xx.h DELETED --- --- tape_idalbuf.h DELETED --- --- tapeblock.c DELETED --- --- tapeblock.h DELETED --- --- tapechar.c DELETED --- --- tapechar.h DELETED --- --- tapedefs.h DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:17
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/s390 In directory sc8-pr-cvs1:/tmp/cvs-serv30451/drivers/s390 Removed Files: qdio.c s390dyn.c Log Message: Merge with 2.5.51 --- qdio.c DELETED --- --- s390dyn.c DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:17
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/fb In directory sc8-pr-cvs1:/tmp/cvs-serv30451/Documentation/fb Removed Files: README-sstfb.txt Log Message: Merge with 2.5.51 --- README-sstfb.txt DELETED --- |
From: Kenn H. <ke...@us...> - 2003-07-07 23:40:17
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/s390 In directory sc8-pr-cvs1:/tmp/cvs-serv30451/Documentation/s390 Removed Files: chandev.8 Log Message: Merge with 2.5.51 --- chandev.8 DELETED --- |