Menu
▾
▴
linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(66) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(17) |
Nov
(1) |
Dec
(220) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(154) |
Feb
(167) |
Mar
(159) |
Apr
(172) |
May
(35) |
Jun
(58) |
Jul
(97) |
Aug
(285) |
Sep
(139) |
Oct
(252) |
Nov
(8) |
Dec
(3) |
| 2004 |
Jan
(13) |
Feb
(159) |
Mar
(136) |
Apr
(33) |
May
(50) |
Jun
(42) |
Jul
(140) |
Aug
(42) |
Sep
(199) |
Oct
(31) |
Nov
(55) |
Dec
|
| 2005 |
Jan
|
Feb
(12) |
Mar
(214) |
Apr
(119) |
May
(21) |
Jun
(2) |
Jul
(127) |
Aug
(10) |
Sep
(3) |
Oct
(24) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(45) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(26) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(35) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2003-04-17 02:18:28
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv9218/arch/vax/kernel
Modified Files:
process.c
Log Message:
Print some more useful info in debugging printk()s
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- process.c 10 Mar 2003 22:38:54 -0000 1.14
+++ process.c 17 Apr 2003 02:18:24 -0000 1.15
@@ -51,8 +51,8 @@
unsigned long pcbb; /* physical address of new pcb */
#ifdef VAX_PROCESS_DEBUG
- printk("vax_switch_to: switching %08lx -> %08lx\n",
- (unsigned long)prev, (unsigned long)next);
+ printk("vax_switch_to: switching %p, pid %d, state %ld -> %p, pid %d, state %ld\n",
+ prev, prev->pid, prev->state, next, next->pid, next->state);
#endif
/* We should check that __pa((prev)->thread.pcb) == PR_PCBB */
@@ -115,7 +115,7 @@
child_stack = (struct new_thread_stack *)(stack_top) - 1;
#ifdef VAX_PROCESS_DEBUG
- printk("copy_thread: pid %d, task 0x%08lx, kstack_top 0x%8lx, usp 0x%08lx, ksp 0x%08lx\n",
+ printk("copy_thread: pid %d, task 0x%08lx, kstack_top %p, usp 0x%08lx, ksp %p\n",
p->pid, (unsigned long)p, stack_top, usp, child_stack);
#endif
child_regs = &child_stack->regs;
@@ -182,8 +182,8 @@
our kernel stack, so we cannot pop anything off. That
means that we can never return from here. */
#ifdef VAX_PROCESS_DEBUG
- printk("kernel_thread: calling thread function at %08lx\n",
- (unsigned long)fn);
+ printk("kernel_thread: task %p, pid %d, calling thread function at %08lx\n",
+ current, current->pid, (unsigned long)fn);
#endif
kernel_thread_exit(fn(arg));
}
|
|
From: Kenn H. <ke...@us...> - 2003-04-17 02:17:40
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv8580/include/asm
Modified Files:
system.h
Log Message:
2.5.44 starts using set_mb() to set current->state, but our implementation
of set_mb() based on xchg() didn't seem to work properly. This needs
investigation, but in the meantime, this fix gets 2.5.44 working again.
Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/system.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- system.h 17 Feb 2003 20:04:17 -0000 1.10
+++ system.h 17 Apr 2003 02:17:36 -0000 1.11
@@ -68,8 +68,8 @@
#define mb() __asm__ __volatile__("": : :"memory")
#define rmb() mb()
#define wmb() mb()
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
+#define set_mb(var, value) do { var = value; mb(); } while (0)
+#define set_wmb(var, value) do { var = value; wmb(); } while (0)
#define smp_mb() mb()
#define smp_rmb() rmb()
|
|
From: Kenn H. <ke...@us...> - 2003-04-17 02:15:24
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv8402/include/asm-vax
Modified Files:
checksum.h
Log Message:
csum_partial_copy() disappears in 2.5.44
Index: checksum.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/checksum.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- checksum.h 20 May 2002 00:33:39 -0000 1.3
+++ checksum.h 17 Apr 2003 02:15:20 -0000 1.4
@@ -93,22 +93,7 @@
}
/*
- * the same as csum_partial, but copies from src while it
- * checksums
- *
- * here even more important to align src and dst on a 32-bit
- * (or even better 64-bit) boundary
- */
-
-extern inline unsigned int
-csum_partial_copy(const char *src, char *dst, int len,unsigned int sum)
-{
- memcpy(dst,src,len);
- return csum_partial(dst, len, sum);
-}
-
-/*
- * the same as csum_partial_copy, but copies from user space.
+ * the same as csum_partial, but copies from user space.
*
* here even more important to align src and dst on a 32-bit (or even
* better 64-bit) boundary
|
|
From: Kenn H. <ke...@us...> - 2003-04-17 02:14:45
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv5404/arch/vax
Modified Files:
vmlinux.lds.S
Log Message:
Changes to names of init sections in 2.5.44
Index: vmlinux.lds.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/vmlinux.lds.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vmlinux.lds.S 16 Feb 2003 23:49:08 -0000 1.1
+++ vmlinux.lds.S 17 Apr 2003 02:14:41 -0000 1.2
@@ -15,6 +15,7 @@
/* kernel is based in S0 space at 0x80100000 */
. = 0x80000000 + 0x100000;
+ /* read-only */
_text = .; /* Text and read-only data */
__kernel_start = .;
.text : {
@@ -45,6 +46,7 @@
__ksymtab : { *(__ksymtab) }
__stop___ksymtab = .;
+ /* writeable */
.data : { /* Data */
*(.data)
CONSTRUCTORS
@@ -55,13 +57,14 @@
. = ALIGN(8192); /* init_task */
.data.init_task : { *(.data.init_task) }
+ /* will be freed after init */
. = ALIGN(4096); /* Init code and data */
__init_begin = .;
- .text.init : { *(.text.init) }
- .data.init : { *(.data.init) }
+ .init.text : { *(.init.text) }
+ .init.data : { *(.init.data) }
. = ALIGN(16);
__setup_start = .;
- .setup.init : { *(.setup.init) }
+ .init.setup : { *(.init.setup) }
__setup_end = .;
__initcall_start = .;
.initcall.init : {
@@ -90,8 +93,8 @@
/* Sections to be discarded */
/DISCARD/ : {
- *(.text.exit)
- *(.data.exit)
+ *(.exit.text)
+ *(.exit.data)
*(.exitcall.exit)
}
|
|
From: Kenn H. <ke...@us...> - 2003-04-17 02:14:44
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot In directory sc8-pr-cvs1:/tmp/cvs-serv5404/arch/vax/boot Modified Files: head.S Log Message: Changes to names of init sections in 2.5.44 Index: head.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/head.S,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- head.S 29 Oct 2002 00:52:50 -0000 1.5 +++ head.S 17 Apr 2003 02:14:41 -0000 1.6 @@ -8,6 +8,7 @@ # Some of this stuff could be in .init sections and thrown away. # +#include <linux/init.h> /* For __INITDATA */ #include <asm/mtpr.h> /* Processor register definitions */ #include <asm/mv.h> /* machine vector definitions */ #include <asm/page.h> /* get PAGE_OFFSET definition */ @@ -405,7 +406,7 @@ prom_sidex: .int 0x00000000 # our dummy pcb -.section .data.init +__INITDATA .globl fake_pcb fake_pcb: .fill 24,4,0x00000000 |
|
From: Kenn H. <ke...@us...> - 2003-04-17 02:04:04
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv4608 Modified Files: .cvsignore Log Message: My build scripts now generate a make.log, rather than make.lst (since *.lst is now deleted during make clean) Index: .cvsignore =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 May 2002 00:33:29 -0000 1.3 +++ .cvsignore 17 Apr 2003 02:04:00 -0000 1.4 @@ -9,4 +9,4 @@ vmlinux.dsk vmlinux.SYS System.map -make.lst +make.log |
|
From: Kenn H. <ke...@us...> - 2003-04-17 02:01:49
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv4400 Modified Files: Makefile Log Message: Delete .lst files during make clean Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- Makefile 26 Mar 2003 00:06:43 -0000 1.51 +++ Makefile 17 Apr 2003 02:01:44 -0000 1.52 @@ -706,6 +706,7 @@ $(call cmd,rmclean) @find . $(RCS_FIND_IGNORE) \ \( -name '*.[oas]' -o -name '.*.cmd' -o -name '.*.d' \ + -o -name '*.lst' \ -o -name '.*.tmp' \) -type f -print | xargs rm -f # mrproper - delete configuration + modules + core files |
|
From: Kenn H. <ke...@us...> - 2003-03-26 00:06:50
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv28285/drivers/char Modified Files: Makefile Log Message: Merge with 2.5.44 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile 24 Mar 2003 23:47:43 -0000 1.26 +++ Makefile 26 Mar 2003 00:06:45 -0000 1.27 @@ -106,6 +106,9 @@ obj-$(CONFIG_DRM) += drm/ obj-$(CONFIG_PCMCIA) += pcmcia/ +# Files generated that shall be removed upon make clean +clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c + include $(TOPDIR)/Rules.make $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) |
|
From: Kenn H. <ke...@us...> - 2003-03-26 00:06:50
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv28285/drivers/scsi
Modified Files:
Makefile scsi_ioctl.c scsi_merge.c
Log Message:
Merge with 2.5.44
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 22 Mar 2003 19:49:41 -0000 1.12
+++ Makefile 26 Mar 2003 00:06:46 -0000 1.13
@@ -138,6 +138,10 @@
cpqfc-objs := cpqfcTSinit.o cpqfcTScontrol.o cpqfcTSi2c.o \
cpqfcTSworker.o cpqfcTStrigger.o
+# Files generated that shall be removed upon make clean
+clean-files := 53c8xx_d.h 53c7xx_d.h sim710_d.h 53c700_d.h \
+ 53c8xx_u.h 53c7xx_u.h sim710_u.h 53c700_u.h
+
include $(TOPDIR)/Rules.make
$(obj)/53c7,8xx.o: $(obj)/53c8xx_d.h $(obj)/53c8xx_u.h
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scsi_ioctl.c 24 Mar 2003 23:47:44 -0000 1.9
+++ scsi_ioctl.c 26 Mar 2003 00:06:47 -0000 1.10
@@ -160,7 +160,7 @@
return 0;
scsi_cmd[0] = ALLOW_MEDIUM_REMOVAL;
- scsi_cmd[1] = (dev->scsi_level <= SCSI_2) ? (dev->lun << 5) : 0;
+ scsi_cmd[1] = 0;
scsi_cmd[2] = 0;
scsi_cmd[3] = 0;
scsi_cmd[4] = state;
@@ -297,12 +297,6 @@
if(copy_from_user(buf, cmd_in + cmdlen, inlen))
goto error;
- /*
- * Set the lun field to the correct value.
- */
- if (dev->scsi_level <= SCSI_2)
- cmd[1] = (cmd[1] & 0x1f) | (dev->lun << 5);
-
switch (opcode) {
case FORMAT_UNIT:
timeout = FORMAT_UNIT_TIMEOUT;
@@ -423,7 +417,6 @@
int scsi_ioctl(Scsi_Device * dev, int cmd, void *arg)
{
char scsi_cmd[MAX_COMMAND_SIZE];
- char cmd_byte1;
/* No idea how this happens.... */
if (!dev)
@@ -438,7 +431,6 @@
if (!scsi_block_when_processing_errors(dev)) {
return -ENODEV;
}
- cmd_byte1 = (dev->scsi_level <= SCSI_2) ? (dev->lun << 5) : 0;
switch (cmd) {
case SCSI_IOCTL_GET_IDLUN:
@@ -491,7 +483,7 @@
return scsi_set_medium_removal(dev, SCSI_REMOVAL_ALLOW);
case SCSI_IOCTL_TEST_UNIT_READY:
scsi_cmd[0] = TEST_UNIT_READY;
- scsi_cmd[1] = cmd_byte1;
+ scsi_cmd[1] = 0;
scsi_cmd[2] = scsi_cmd[3] = scsi_cmd[5] = 0;
scsi_cmd[4] = 0;
return ioctl_internal_command((Scsi_Device *) dev, scsi_cmd,
@@ -499,7 +491,7 @@
break;
case SCSI_IOCTL_START_UNIT:
scsi_cmd[0] = START_STOP;
- scsi_cmd[1] = cmd_byte1;
+ scsi_cmd[1] = 0;
scsi_cmd[2] = scsi_cmd[3] = scsi_cmd[5] = 0;
scsi_cmd[4] = 1;
return ioctl_internal_command((Scsi_Device *) dev, scsi_cmd,
@@ -507,7 +499,7 @@
break;
case SCSI_IOCTL_STOP_UNIT:
scsi_cmd[0] = START_STOP;
- scsi_cmd[1] = cmd_byte1;
+ scsi_cmd[1] = 0;
scsi_cmd[2] = scsi_cmd[3] = scsi_cmd[5] = 0;
scsi_cmd[4] = 0;
return ioctl_internal_command((Scsi_Device *) dev, scsi_cmd,
Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scsi_merge.c 14 Mar 2003 00:43:39 -0000 1.11
+++ scsi_merge.c 26 Mar 2003 00:06:47 -0000 1.12
@@ -62,16 +62,28 @@
int count, gfp_mask;
/*
- * First we need to know how many scatter gather segments are needed.
+ * non-sg block request. FIXME: check bouncing for isa hosts!
*/
- count = req->nr_phys_segments;
+ if ((req->flags & REQ_BLOCK_PC) && !req->bio) {
+ /*
+ * FIXME: isa bouncing
+ */
+ if (SCpnt->host->unchecked_isa_dma)
+ goto fail;
+
+ SCpnt->request_bufflen = req->data_len;
+ SCpnt->request_buffer = req->data;
+ req->buffer = req->data;
+ SCpnt->use_sg = 0;
+ return 1;
+ }
/*
* we used to not use scatter-gather for single segment request,
* but now we do (it makes highmem I/O easier to support without
* kmapping pages)
*/
- SCpnt->use_sg = count;
+ SCpnt->use_sg = req->nr_phys_segments;
gfp_mask = GFP_NOIO;
if (in_interrupt()) {
@@ -111,6 +123,7 @@
/*
* kill it. there should be no leftover blocks in this request
*/
+fail:
SCpnt = scsi_end_request(SCpnt, 0, req->nr_sectors);
BUG_ON(SCpnt);
return 0;
|
|
From: Kenn H. <ke...@us...> - 2003-03-26 00:06:49
|
Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv28285
Modified Files:
Makefile Rules.make
Log Message:
Merge with 2.5.44
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Makefile 24 Mar 2003 23:47:41 -0000 1.50
+++ Makefile 26 Mar 2003 00:06:43 -0000 1.51
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 43
+SUBLEVEL = 44
EXTRAVERSION =
# *DOCUMENTATION*
@@ -239,7 +239,7 @@
# If .config doesn't exist - tough luck
-.config: arch/$(ARCH)/config.in $(shell find . -name Config.in)
+.config: arch/$(ARCH)/config.in # FIXME $(shell find . -name Config.in)
@echo '***'
@if [ -f $@ ]; then \
echo '*** The tree was updated, so your .config may be'; \
@@ -456,18 +456,23 @@
depend dep: .hdepend
-# .hdepend is our (misnomed) marker for whether we've run
+# .hdepend is our (misnomed) marker for whether we've
# generated module versions
-.hdepend: $(if $(filter dep depend,$(MAKECMDGOALS)),FORCE)
+make-versions := $(strip $(if $(filter dep depend,$(MAKECMDGOALS)),1) \
+ $(if $(wildcard .hdepend),,1))
+
+.hdepend: prepare FORCE
+ifneq ($(make-versions),)
@$(MAKE) include/linux/modversions.h
@touch $@
+endif
ifdef CONFIG_MODVERSIONS
# Update modversions.h, but only if it would change.
-include/linux/modversions.h: scripts/fixdep prepare FORCE
+include/linux/modversions.h: FORCE
@rm -rf .tmp_export-objs
@$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS))
@echo -n ' Generating $@'
@@ -661,90 +666,61 @@
defconfig:
yes '' | $(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in
-# Cleaning up
-# ---------------------------------------------------------------------------
+###
+# Cleaning is done on three levels.
+# 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
+# make distclean Remove editor backup files, patch leftover files and the like
-# files removed with 'make clean'
-CLEAN_FILES += \
- include/linux/compile.h \
- vmlinux System.map \
- drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
- drivers/char/conmakehash \
- drivers/char/drm/*-mod.c \
- drivers/char/defkeymap.c drivers/char/qtronixmap.c \
- drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
- drivers/zorro/devlist.h drivers/zorro/gen-devlist \
- sound/oss/bin2hex sound/oss/hex2hex \
- drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
- drivers/scsi/aic7xxx/aic7xxx_seq.h \
- drivers/scsi/aic7xxx/aic7xxx_reg.h \
- drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \
- drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
- drivers/scsi/aic7xxx/aicasm/y.tab.h \
- drivers/scsi/aic7xxx/aicasm/aicasm \
- drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
- drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
- drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
- net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
- net/802/pseudo/pseudocode.h \
- net/khttpd/make_times_h net/khttpd/times.h \
- submenu*
+# Files removed with 'make clean'
+CLEAN_FILES += vmlinux System.map MC*
-# files removed with 'make mrproper'
+# Files removed with 'make mrproper'
MRPROPER_FILES += \
include/linux/autoconf.h include/linux/version.h \
- drivers/net/hamradio/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h \
- drivers/net/hamradio/soundmodem/sm_tbl_{hapn4800,psk4800}.h \
- drivers/net/hamradio/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h \
- drivers/net/hamradio/soundmodem/gentbl \
- sound/oss/*_boot.h sound/oss/.*.boot \
- sound/oss/msndinit.c \
- sound/oss/msndperm.c \
- sound/oss/pndsperm.c \
- sound/oss/pndspini.c \
- drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw \
- .version .config* config.in config.old \
- scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
- scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
+ .version .config .config.old config.in config.old \
.menuconfig.log \
include/asm \
.hdepend include/linux/modversions.h \
tags TAGS kernel.spec \
.tmp*
-# directories removed with 'make mrproper'
+# Directories removed with 'make mrproper'
MRPROPER_DIRS += \
.tmp_export-objs \
include/config \
include/linux/modules
-clean: archclean
- @echo 'Cleaning up'
- @find . $(RCS_FIND_IGNORE) \
- \( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
- -name .\*.tmp -o -name .\*.d \) -type f -print \
- | grep -v lxdialog/ | xargs rm -f
- @rm -f $(CLEAN_FILES)
- +@$(call descend,Documentation/DocBook,clean)
+# clean - Delete all intermediate files
+#
+clean-dirs += $(ALL_SUBDIRS) Documentation/DocBook scripts
-mrproper: clean archmrproper
- @echo 'Making mrproper'
+$(addprefix _clean_,$(clean-dirs)):
+ $(MAKE) MAKEFILES= -rR -f scripts/Makefile.clean obj=$(patsubst _clean_%,%,$@)
+
+quiet_cmd_rmclean = RM $$(CLEAN_FILES)
+cmd_rmclean = rm -f $(CLEAN_FILES)
+clean: archclean $(addprefix _clean_,$(clean-dirs))
+ $(call cmd,rmclean)
@find . $(RCS_FIND_IGNORE) \
- \( -name .depend -o -name .\*.cmd \) \
- -type f -print | xargs rm -f
- @rm -rf $(MRPROPER_DIRS)
- @rm -f $(MRPROPER_FILES)
- +@$(call descend,scripts,mrproper)
- +@$(call descend,Documentation/DocBook,mrproper)
+ \( -name '*.[oas]' -o -name '.*.cmd' -o -name '.*.d' \
+ -o -name '.*.tmp' \) -type f -print | xargs rm -f
-distclean: mrproper
- @echo 'Making distclean'
+# mrproper - delete configuration + modules + core files
+#
+quiet_cmd_mrproper = RM $$(MRPROPER_DIRS) + $$(MRPROPER_FILES)
+cmd_mrproper = rm -rf $(MRPROPER_DIRS) && rm -f $(MRPROPER_FILES)
+mrproper distclean: clean archmrproper
+ @echo ' Making $@ in the srctree'
@find . $(RCS_FIND_IGNORE) \
- \( -not -type d \) -and \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
- -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f \
- -print | xargs rm -f
+ -o -name '.*.rej' -o -size 0 \
+ -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+ -type f -print | xargs rm -f
+ $(call cmd,mrproper)
# Generate tags for editors
# ---------------------------------------------------------------------------
Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Rules.make 22 Mar 2003 19:49:05 -0000 1.24
+++ Rules.make 26 Mar 2003 00:06:45 -0000 1.25
@@ -1,3 +1,6 @@
+
+ifndef no-rules.make
+
#
# This file contains rules which are shared between multiple Makefiles.
#
@@ -87,6 +90,7 @@
# Subdirectories we need to descend into
subdir-ym := $(sort $(subdir-y) $(subdir-m))
+subdir-ymn := $(sort $(subdir-ym) $(subdir-n) $(subdir-))
# export.o is never a composite object, since $(export-objs) has a
# fixed meaning (== objects which EXPORT_SYMBOL())
@@ -113,6 +117,10 @@
# Only build module versions for files which are selected to be built
export-objs := $(filter $(export-objs),$(real-objs-y) $(real-objs-m))
+host-progs-single := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m)))
+host-progs-multi := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
+host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs))
+
# Add subdir path
EXTRA_TARGETS := $(addprefix $(obj)/,$(EXTRA_TARGETS))
@@ -127,12 +135,19 @@
multi-objs-y := $(addprefix $(obj)/,$(multi-objs-y))
multi-objs-m := $(addprefix $(obj)/,$(multi-objs-m))
subdir-ym := $(addprefix $(obj)/,$(subdir-ym))
+subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
+clean-files := $(addprefix $(obj)/,$(clean-files))
+host-progs := $(addprefix $(obj)/,$(host-progs))
+host-progs-single := $(addprefix $(obj)/,$(host-progs-single))
+host-progs-multi := $(addprefix $(obj)/,$(host-progs-multi))
+host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs))
# The temporary file to save gcc -MD generated dependencies must not
# contain a comma
depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
-# We're called for one of three purposes:
+# We're called for one of four purposes:
+# o subdirclean: Delete intermidiate files in the current directory
# o fastdep: build module version files (.ver) for $(export-objs) in
# the current directory
# o modules_install: install the modules in the current directory
@@ -142,6 +157,19 @@
# When targets are given directly (like foo.o), we just build these
# targets (That happens when someone does make some/dir/foo.[ois])
+ifeq ($(MAKECMDGOALS),subdirclean)
+
+__clean-files := $(wildcard $(EXTRA_TARGETS) $(host-progs) $(clean-files))
+
+subdirclean: $(subdir-ymn)
+ifneq ($(strip $(__clean-files) $(clean-rule)),)
+ rm -f $(__clean-files)
+ $(clean-rule)
+else
+ @:
+endif
+
+else
ifeq ($(MAKECMDGOALS),fastdep)
# ===========================================================================
@@ -154,14 +182,14 @@
# ---------------------------------------------------------------------------
fastdep: $(subdir-ym)
- @/bin/true
+ @:
else
# This sets version suffixes on exported symbols
# ---------------------------------------------------------------------------
-MODVERDIR := include/linux/modules/
+MODVERDIR := include/linux/modules
#
# Added the SMP separator to stop module accidents between uniprocessor
@@ -246,7 +274,7 @@
ifneq ($(obj-m),)
$(call cmd,modules_install)
else
- @/bin/true
+ @:
endif
else # ! modules_install
@@ -255,23 +283,18 @@
# Building
# ==========================================================================
-# If a Makefile does define neither O_TARGET nor L_TARGET,
-# use a standard O_TARGET named "built-in.o"
-
-ifndef O_TARGET
-ifndef L_TARGET
-O_TARGET := $(obj)/built-in.o
-endif
-endif
+# If a Makefile does not define a L_TARGET, link an object called "built-in.o"
ifdef L_TARGET
L_TARGET := $(obj)/$(L_TARGET)
+else
+O_TARGET := $(obj)/built-in.o
endif
first_rule: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \
$(if $(KBUILD_MODULES),$(obj-m)) \
$(subdir-ym)
- @/bin/true
+ @:
# define listing_o_c to get compiler listings from .c -> .o compilations
listing_o_c = -Wa,-adnhls=$(subst $(comma),_,$(@D)/$(*F)).lst -g
@@ -402,14 +425,6 @@
# Compile programs on the host
# ===========================================================================
-host-progs-single := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m)))
-host-progs-multi := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
-host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs))
-host-progs := $(addprefix $(obj)/,$(host-progs))
-host-progs-single := $(addprefix $(obj)/,$(host-progs-single))
-host-progs-multi := $(addprefix $(obj)/,$(host-progs-multi))
-host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs))
-
quiet_cmd_host_cc__c = HOSTCC $(echo_target)
cmd_host_cc__c = $(HOSTCC) -Wp,-MD,$(depfile) \
$(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \
@@ -434,6 +449,7 @@
targets += $(host-progs-single) $(host-progs-multi-objs) $(host-progs-multi)
+endif # ! subdirclean
endif # ! modules_install
endif # ! fastdep
@@ -483,9 +499,9 @@
# Descending
# ---------------------------------------------------------------------------
-.PHONY: $(subdir-ym)
+.PHONY: $(subdir-ymn)
-$(subdir-ym):
+$(subdir-ymn):
+@$(call descend,$@,$(MAKECMDGOALS))
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
@@ -608,3 +624,5 @@
descend = echo '$(MAKE) -f $(1)/Makefile $(2)';
endif
descend += $(MAKE) -f $(1)/Makefile obj=$(1) $(2)
+
+endif
|
|
From: Kenn H. <ke...@us...> - 2003-03-25 23:48:57
|
Update of /cvsroot/linux-vax/kernel-2.5/net/bluetooth/bnep In directory sc8-pr-cvs1:/tmp/cvs-serv21829a/net/bluetooth/bnep Removed Files: crc32.c crc32.h Log Message: Merge with 2.5.44 --- crc32.c DELETED --- --- crc32.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-25 23:48:57
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/pnp In directory sc8-pr-cvs1:/tmp/cvs-serv21829a/drivers/pnp Removed Files: isapnp.c isapnp_proc.c pnpbios_core.c pnpbios_proc.c Log Message: Merge with 2.5.44 --- isapnp.c DELETED --- --- isapnp_proc.c DELETED --- --- pnpbios_core.c DELETED --- --- pnpbios_proc.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-25 23:48:57
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/sparc/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv21829a/arch/sparc/kernel Removed Files: check_asm.sh Log Message: Merge with 2.5.44 --- check_asm.sh DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-25 23:48:57
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/ppc/boot/common In directory sc8-pr-cvs1:/tmp/cvs-serv21829a/arch/ppc/boot/common Removed Files: misc-simple.c relocate.S Log Message: Merge with 2.5.44 --- misc-simple.c DELETED --- --- relocate.S DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-25 23:48:56
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/sh/lib In directory sc8-pr-cvs1:/tmp/cvs-serv21829a/arch/sh/lib Removed Files: old-checksum.c Log Message: Merge with 2.5.44 --- old-checksum.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-25 23:48:56
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/i386/lib In directory sc8-pr-cvs1:/tmp/cvs-serv21829a/arch/i386/lib Removed Files: old-checksum.c Log Message: Merge with 2.5.44 --- old-checksum.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:49:23
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1:/tmp/cvs-serv8089/arch/vax Modified Files: 460.config Log Message: Update defconfig for VS4000/60 Index: 460.config =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/460.config,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- 460.config 16 Feb 2003 23:47:57 -0000 1.12 +++ 460.config 24 Mar 2003 23:49:19 -0000 1.13 @@ -206,13 +206,16 @@ # CONFIG_INTERMEZZO_FS is not set CONFIG_NFS_FS=y # CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set # CONFIG_NFSD_V3 is not set +# CONFIG_NFSD_V4 is not set # CONFIG_NFSD_TCP is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_EXPORTFS is not set +# CONFIG_CIFS is not set # CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set @@ -223,6 +226,7 @@ # CONFIG_NCPFS_SMALLDOS is not set # CONFIG_NCPFS_NLS is not set # CONFIG_NCPFS_EXTRAS is not set +# CONFIG_AFS_FS is not set # CONFIG_ZISOFS_FS is not set # |
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:48:53
|
Update of /cvsroot/linux-vax/kernel-2.5/fs/nfs
In directory sc8-pr-cvs1:/tmp/cvs-serv7317/fs/nfs
Modified Files:
inode.c proc.c
Log Message:
Two NFS fixes that will appear in 2.5.44. Needed now to prevent
a crash during boot with NFS-root.
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/nfs/inode.c,v
retrieving revision 1.1.1.23
retrieving revision 1.2
diff -u -r1.1.1.23 -r1.2
--- inode.c 24 Mar 2003 21:32:42 -0000 1.1.1.23
+++ inode.c 24 Mar 2003 23:48:49 -0000 1.2
@@ -1355,7 +1355,7 @@
if (data->auth_flavourlen != 0) {
if (data->auth_flavourlen > 1)
printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavours.\n");
- if (copy_from_user(authflavour, data->auth_flavours, sizeof(authflavour))) {
+ if (copy_from_user(&authflavour, data->auth_flavours, sizeof(authflavour))) {
err = -EFAULT;
goto out_fail;
}
Index: proc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/nfs/proc.c,v
retrieving revision 1.1.1.8
retrieving revision 1.2
diff -u -r1.1.1.8 -r1.2
--- proc.c 24 Mar 2003 21:32:43 -0000 1.1.1.8
+++ proc.c 24 Mar 2003 23:48:49 -0000 1.2
@@ -490,7 +490,7 @@
dprintk("NFS call fsinfo\n");
info->fattr->valid = 0;
- status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &info, 0);
+ status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &fsinfo, 0);
dprintk("NFS reply fsinfo: %d\n", status);
if (status)
goto out;
|
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:47:53
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv6386/drivers/char
Modified Files:
Makefile tty_io.c
Log Message:
Merge with 2.5.43
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile 20 Mar 2003 00:44:42 -0000 1.25
+++ Makefile 24 Mar 2003 23:47:43 -0000 1.26
@@ -52,6 +52,7 @@
obj-$(CONFIG_SERIAL_IPR) += generic_serial.o
obj-$(CONFIG_PRINTER) += lp.o
+obj-$(CONFIG_TIPAR) += tipar.o
obj-$(CONFIG_BUSMOUSE) += busmouse.o
obj-$(CONFIG_DTLK) += dtlk.o
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tty_io.c 20 Mar 2003 00:44:42 -0000 1.10
+++ tty_io.c 24 Mar 2003 23:47:43 -0000 1.11
@@ -113,7 +113,7 @@
#define CHECK_TTY_COUNT 1
struct termios tty_std_termios; /* for the benefit of tty drivers */
-struct tty_driver *tty_drivers; /* linked list of tty drivers */
+LIST_HEAD(tty_drivers); /* linked list of tty drivers */
struct tty_ldisc ldiscs[NR_LDISCS]; /* line disc dispatch table */
#ifdef CONFIG_UNIX98_PTYS
@@ -338,7 +338,7 @@
minor = minor(device);
major = major(device);
- for (p = tty_drivers; p; p = p->next) {
+ list_for_each_entry(p, &tty_drivers, tty_drivers) {
if (p->major != major)
continue;
if (minor < p->minor_start)
@@ -2083,10 +2083,7 @@
if (!driver->put_char)
driver->put_char = tty_default_put_char;
- driver->prev = 0;
- driver->next = tty_drivers;
- if (tty_drivers) tty_drivers->prev = driver;
- tty_drivers = driver;
+ list_add(&driver->tty_drivers, &tty_drivers);
if ( !(driver->flags & TTY_DRIVER_NO_DEVFS) ) {
for(i = 0; i < driver->num; i++)
@@ -2110,7 +2107,7 @@
if (*driver->refcount)
return -EBUSY;
- for (p = tty_drivers; p; p = p->next) {
+ list_for_each_entry(p, &tty_drivers, tty_drivers) {
if (p == driver)
found++;
else if (p->major == driver->major)
@@ -2127,13 +2124,7 @@
} else
register_chrdev(driver->major, othername, &tty_fops);
- if (driver->prev)
- driver->prev->next = driver->next;
- else
- tty_drivers = driver->next;
-
- if (driver->next)
- driver->next->prev = driver->prev;
+ list_del(&driver->tty_drivers);
/*
* Free the termios and termios_locked structures because
|
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:47:53
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv6386/drivers Modified Files: Makefile Log Message: Merge with 2.5.43 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile 9 Feb 2003 21:34:06 -0000 1.13 +++ Makefile 24 Mar 2003 23:47:42 -0000 1.14 @@ -38,7 +38,7 @@ obj-$(CONFIG_I2C) += i2c/ obj-$(CONFIG_PHONE) += telephony/ obj-$(CONFIG_MD) += md/ -obj-$(CONFIG_BLUEZ) += bluetooth/ +obj-$(CONFIG_BT) += bluetooth/ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ obj-$(CONFIG_ISDN_BOOL) += isdn/ |
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:47:53
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv6386/drivers/scsi
Modified Files:
scsi_ioctl.c
Log Message:
Merge with 2.5.43
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scsi_ioctl.c 22 Mar 2003 19:49:41 -0000 1.8
+++ scsi_ioctl.c 24 Mar 2003 23:47:44 -0000 1.9
@@ -151,6 +151,29 @@
return result;
}
+int scsi_set_medium_removal(Scsi_Device *dev, char state)
+{
+ char scsi_cmd[MAX_COMMAND_SIZE];
+ int ret;
+
+ if (!dev->removable || !dev->lockable)
+ return 0;
+
+ scsi_cmd[0] = ALLOW_MEDIUM_REMOVAL;
+ scsi_cmd[1] = (dev->scsi_level <= SCSI_2) ? (dev->lun << 5) : 0;
+ scsi_cmd[2] = 0;
+ scsi_cmd[3] = 0;
+ scsi_cmd[4] = state;
+ scsi_cmd[5] = 0;
+
+ ret = ioctl_internal_command(dev, scsi_cmd, IOCTL_NORMAL_TIMEOUT, NORMAL_RETRIES);
+
+ if (ret == 0)
+ dev->locked = state == SCSI_REMOVAL_PREVENT;
+
+ return ret;
+}
+
/*
* This interface is deprecated - users should use the scsi generic (sg)
* interface instead, as this is a more flexible approach to performing
@@ -463,24 +486,9 @@
return scsi_ioctl_send_command((Scsi_Device *) dev,
(Scsi_Ioctl_Command *) arg);
case SCSI_IOCTL_DOORLOCK:
- if (!dev->removable || !dev->lockable)
- return 0;
- scsi_cmd[0] = ALLOW_MEDIUM_REMOVAL;
- scsi_cmd[1] = cmd_byte1;
- scsi_cmd[2] = scsi_cmd[3] = scsi_cmd[5] = 0;
- scsi_cmd[4] = SCSI_REMOVAL_PREVENT;
- return ioctl_internal_command((Scsi_Device *) dev, scsi_cmd,
- IOCTL_NORMAL_TIMEOUT, NORMAL_RETRIES);
- break;
+ return scsi_set_medium_removal(dev, SCSI_REMOVAL_PREVENT);
case SCSI_IOCTL_DOORUNLOCK:
- if (!dev->removable || !dev->lockable)
- return 0;
- scsi_cmd[0] = ALLOW_MEDIUM_REMOVAL;
- scsi_cmd[1] = cmd_byte1;
- scsi_cmd[2] = scsi_cmd[3] = scsi_cmd[5] = 0;
- scsi_cmd[4] = SCSI_REMOVAL_ALLOW;
- return ioctl_internal_command((Scsi_Device *) dev, scsi_cmd,
- IOCTL_NORMAL_TIMEOUT, NORMAL_RETRIES);
+ return scsi_set_medium_removal(dev, SCSI_REMOVAL_ALLOW);
case SCSI_IOCTL_TEST_UNIT_READY:
scsi_cmd[0] = TEST_UNIT_READY;
scsi_cmd[1] = cmd_byte1;
|
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:47:52
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv6386 Modified Files: Makefile Log Message: Merge with 2.5.43 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- Makefile 22 Mar 2003 19:49:05 -0000 1.49 +++ Makefile 24 Mar 2003 23:47:41 -0000 1.50 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 42 +SUBLEVEL = 43 EXTRAVERSION = # *DOCUMENTATION* |
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:12:18
|
Update of /cvsroot/linux-vax/kernel-2.5/net/ipv6 In directory sc8-pr-cvs1:/tmp/cvs-serv869/net/ipv6 Removed Files: ip6_fw.c Log Message: Merge with 2.5.43 --- ip6_fw.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-24 23:12:16
|
Update of /cvsroot/linux-vax/kernel-2.5/fs In directory sc8-pr-cvs1:/tmp/cvs-serv869/fs Removed Files: iobuf.c Log Message: Merge with 2.5.43 --- iobuf.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-03-24 21:53:18
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb/media In directory sc8-pr-cvs1:/tmp/cvs-serv5575/usb/media Removed Files: vicam.h vicamurbs.h Log Message: Merge with 2.5.43 --- vicam.h DELETED --- --- vicamurbs.h DELETED --- |
