Menu
▾
▴
linux-vax-commit — [LIST CLOSED] Notifications of commits to complete Linux/VAX CVS tree
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
(9) |
Apr
(27) |
May
(5) |
Jun
(8) |
Jul
(50) |
Aug
(286) |
Sep
(2) |
Oct
(43) |
Nov
(4) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(79) |
Feb
(102) |
Mar
(29) |
Apr
(2) |
May
(22) |
Jun
(41) |
Jul
(11) |
Aug
(28) |
Sep
(58) |
Oct
(4) |
Nov
(18) |
Dec
(8) |
| 2002 |
Jan
(2) |
Feb
(2) |
Mar
(1) |
Apr
(478) |
May
(469) |
Jun
(78) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(47) |
Nov
(5) |
Dec
(227) |
| 2003 |
Jan
(155) |
Feb
(188) |
Mar
(160) |
Apr
(172) |
May
(41) |
Jun
(205) |
Jul
(104) |
Aug
(289) |
Sep
(31) |
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2003-08-24 20:06:41
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-alpha In directory sc8-pr-cvs1:/tmp/cvs-serv28693/include/asm-alpha Removed Files: linux_logo.h Log Message: Merge with 2.5.66 --- linux_logo.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 20:06:41
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-i386 In directory sc8-pr-cvs1:/tmp/cvs-serv28693/include/asm-i386 Removed Files: linux_logo.h Log Message: Merge with 2.5.66 --- linux_logo.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 20:06:41
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-arm In directory sc8-pr-cvs1:/tmp/cvs-serv28693/include/asm-arm Removed Files: linux_logo.h Log Message: Merge with 2.5.66 --- linux_logo.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 20:06:41
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/boot/compressed In directory sc8-pr-cvs1:/tmp/cvs-serv28693/arch/arm/boot/compressed Removed Files: head-netwinder.S Log Message: Merge with 2.5.66 --- head-netwinder.S DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 20:06:41
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/fb In directory sc8-pr-cvs1:/tmp/cvs-serv28693/Documentation/fb Removed Files: clgenfb.txt Log Message: Merge with 2.5.66 --- clgenfb.txt DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 17:09:27
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv26384/arch/vax
Modified Files:
vmlinux.lds.S
Log Message:
Need a section for console initcalls
Index: vmlinux.lds.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/vmlinux.lds.S,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vmlinux.lds.S 3 Aug 2003 12:10:19 -0000 1.7
+++ vmlinux.lds.S 24 Aug 2003 12:42:02 -0000 1.8
@@ -97,6 +97,13 @@
__initramfs_end = .;
}
+ . = ALIGN(8);
+ .con_initcall.init : {
+ __con_initcall_start = .;
+ *(.con_initcall.init)
+ __con_initcall_end = .;
+ }
+
. = ALIGN(4096);
__init_end = .; /* This is end of loadable image */
|
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:51:40
|
Update of /cvsroot/linux-vax/kernel-2.5/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv20755/scripts
Modified Files:
Makefile.build
Log Message:
Merge with 2.5.65
Index: Makefile.build
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.build 23 Aug 2003 12:44:07 -0000 1.11
+++ Makefile.build 24 Aug 2003 12:04:03 -0000 1.12
@@ -15,6 +15,14 @@
include scripts/Makefile.lib
+ifdef EXTRA_TARGETS
+$(warning kbuild: $(obj)/Makefile - Usage of EXTRA_TARGETS is obsolete in 2.5. Please fix!)
+endif
+
+ifdef build-targets
+$(warning kbuild: $(obj)/Makefile - Usage of build-targets is obsolete in 2.5. Please fix!)
+endif
+
ifdef export-objs
$(warning kbuild: $(obj)/Makefile - Usage of export-objs is obsolete in 2.5. Please fix!)
endif
@@ -53,9 +61,9 @@
touch-module = @echo $(@:.o=.ko) > $(MODVERDIR)/$(@F:.o=.mod)
-__build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \
+__build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(extra-y)) \
$(if $(KBUILD_MODULES),$(obj-m)) \
- $(subdir-ym) $(build-targets)
+ $(subdir-ym) $(always)
@:
# Module versioning
@@ -166,12 +174,12 @@
# Single-part modules are special since we need to mark them in $(MODVERDIR)
$(single-used-m): %.o: %.c FORCE
- $(touch-module)
ifdef CONFIG_MODVERSIONS
$(call if_changed_rule,vcc_o_c)
else
$(call if_changed_dep,cc_o_c)
endif
+ $(touch-module)
quiet_cmd_cc_lst_c = MKLST $@
cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
@@ -201,8 +209,7 @@
%.o: %.S FORCE
$(call if_changed_dep,as_o_S)
-targets += $(real-objs-y) $(real-objs-m) $(EXTRA_TARGETS) $(MAKECMDGOALS) \
- $(build-targets)
+targets += $(real-objs-y) $(real-objs-m) $(extra-y) $(MAKECMDGOALS) $(always)
# Build the compiled-in targets
# ---------------------------------------------------------------------------
@@ -265,8 +272,8 @@
$(call if_changed,link_multi-y)
$(multi-used-m) : %.o: $(multi-objs-m) FORCE
- $(touch-module)
$(call if_changed,link_multi-m)
+ $(touch-module)
targets += $(multi-used-y) $(multi-used-m)
|
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:51:18
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux In directory sc8-pr-cvs1:/tmp/cvs-serv20755/include/linux Modified Files: elf.h Log Message: Merge with 2.5.65 Index: elf.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- elf.h 19 Aug 2003 20:41:14 -0000 1.13 +++ elf.h 24 Aug 2003 12:04:03 -0000 1.14 @@ -85,6 +85,8 @@ #define EM_V850 87 /* NEC v850 */ +#define EM_H8_300H 47 /* Hitachi H8/300H */ +#define EM_H8S 48 /* Hitachi H8S */ /* * This is an interim value that we will use until the committee comes |
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:42:27
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/tools In directory sc8-pr-cvs1:/tmp/cvs-serv26515/arch/vax/boot/tools Modified Files: Makefile Log Message: EXTRA_TARGETS now obsolete in 2.5.65 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/tools/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 10 Jul 2003 00:13:16 -0000 1.4 +++ Makefile 24 Aug 2003 12:42:24 -0000 1.5 @@ -1,7 +1,7 @@ -EXTRA_TARGETS := mkbootblk setcmdline showcmdline host-progs := mkbootblk setcmdline +extra-y := showcmdline $(obj)/showcmdline: $(obj)/setcmdline ln -f $< $@ |
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:41:30
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1:/tmp/cvs-serv26169/arch/vax Modified Files: Makefile Log Message: I don't think we should be passing a fully-qualified path to make -f .../Makefile.build obj=/usr/..../arch/vax/boot/tools. So remove the TOPDIR part from TOOLSDIR definition. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile 18 Jun 2003 22:58:01 -0000 1.22 +++ Makefile 24 Aug 2003 12:41:27 -0000 1.23 @@ -36,11 +36,11 @@ core-y += arch/vax/kernel/ arch/vax/mm/ libs-y += arch/vax/lib/ -TOOLSDIR := $(TOPDIR)/arch/vax/boot/tools -MKBOOTBLK := $(TOOLSDIR)/mkbootblk +TOOLSDIR := arch/vax/boot/tools +MKBOOTBLK := $(TOPDIR)/$(TOOLSDIR)/mkbootblk DEFAULT_CMDLINE := root=/dev/nfs nfsroot=/home/disk_vax/vaxroot ip=bootp rw debug -SETCMDLINE := $(TOOLSDIR)/setcmdline -SHOWCMDLINE := $(TOOLSDIR)/showcmdline +SETCMDLINE := $(TOPDIR)/$(TOOLSDIR)/setcmdline +SHOWCMDLINE := $(TOPDIR)/$(TOOLSDIR)/showcmdline # Default target if none specified is to make a MOP image all: mopboot |
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:40:16
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1:/tmp/cvs-serv26043/arch/vax Modified Files: Kconfig Log Message: SWAP config item now in arch-independent config files Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Kconfig 22 Jul 2003 01:28:00 -0000 1.3 +++ Kconfig 24 Aug 2003 12:40:12 -0000 1.4 @@ -17,10 +17,6 @@ bool default y -config SWAP - bool - default y - config UID16 bool default y |
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:27:04
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-x86_64 In directory sc8-pr-cvs1:/tmp/cvs-serv20755/include/asm-x86_64 Removed Files: socket32.h Log Message: Merge with 2.5.65 --- socket32.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:04:06
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/media/video In directory sc8-pr-cvs1:/tmp/cvs-serv20755/drivers/media/video Removed Files: audiochip.h id.h tuner.h video-buf.h Log Message: Merge with 2.5.65 --- audiochip.h DELETED --- --- id.h DELETED --- --- tuner.h DELETED --- --- video-buf.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:04:05
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv20755/drivers/char
Modified Files:
Makefile tty_io.c
Removed Files:
amd768_rng.c i810_rng.c
Log Message:
Merge with 2.5.65
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile 23 Aug 2003 12:44:06 -0000 1.36
+++ Makefile 24 Aug 2003 12:04:03 -0000 1.37
@@ -61,8 +61,7 @@
obj-$(CONFIG_TOSHIBA) += toshiba.o
obj-$(CONFIG_I8K) += i8k.o
obj-$(CONFIG_DS1620) += ds1620.o
-obj-$(CONFIG_INTEL_RNG) += i810_rng.o
-obj-$(CONFIG_AMD_RNG) += amd768_rng.o
+obj-$(CONFIG_HW_RANDOM) += hw_random.o
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
obj-$(CONFIG_FTAPE) += ftape/
obj-$(CONFIG_H8) += h8.o
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tty_io.c 23 Aug 2003 12:44:06 -0000 1.22
+++ tty_io.c 24 Aug 2003 12:04:03 -0000 1.23
@@ -113,7 +113,15 @@
#define TTY_PARANOIA_CHECK 1
#define CHECK_TTY_COUNT 1
-struct termios tty_std_termios; /* for the benefit of tty drivers */
+struct termios tty_std_termios = { /* for the benefit of tty drivers */
+ .c_iflag = ICRNL | IXON,
+ .c_oflag = OPOST | ONLCR,
+ .c_cflag = B38400 | CS8 | CREAD | HUPCL,
+ .c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK |
+ ECHOCTL | ECHOKE | IEXTEN,
+ .c_cc = INIT_C_CC
+};
+
LIST_HEAD(tty_drivers); /* linked list of tty drivers */
struct tty_ldisc ldiscs[NR_LDISCS]; /* line disc dispatch table */
@@ -141,26 +149,13 @@
unsigned int cmd, unsigned long arg);
static int tty_fasync(int fd, struct file * filp, int on);
extern int vme_scc_init (void);
-extern long vme_scc_console_init(void);
extern int serial167_init(void);
-extern long serial167_console_init(void);
-extern void console_8xx_init(void);
extern int rs_8xx_init(void);
-extern void mac_scc_console_init(void);
-extern void sclp_console_init(void);
-extern void sclp_tty_init(void);
-extern void con3215_init(void);
-extern void tub3270_con_init(void);
+extern void hwc_tty_init(void);
+extern void tty3215_init(void);
extern void tub3270_init(void);
-extern void uart_console_init(void);
-extern void sgi_serial_console_init(void);
-extern void sci_console_init(void);
-extern void m68328_console_init(void);
-extern void mcfrs_console_init(void);
extern void rs_360_init(void);
-extern void tx3912_console_init(void);
extern void tx3912_rs_init(void);
-extern void hvc_console_init(void);
static struct tty_struct *alloc_tty_struct(void)
{
@@ -306,13 +301,9 @@
if (tty->ldisc.open)
retval = (tty->ldisc.open)(tty);
if (retval < 0) {
- module_put(tty->ldisc.owner);
-
tty->ldisc = o_ldisc;
tty->termios->c_line = tty->ldisc.num;
if (tty->ldisc.open && (tty->ldisc.open(tty) < 0)) {
- module_put(tty->ldisc.owner);
-
tty->ldisc = ldiscs[N_TTY];
tty->termios->c_line = N_TTY;
if (tty->ldisc.open) {
@@ -2206,93 +2197,28 @@
*/
void __init console_init(void)
{
+ initcall_t *call;
+
/* Setup the default TTY line discipline. */
- memset(ldiscs, 0, sizeof(ldiscs));
(void) tty_register_ldisc(N_TTY, &tty_ldisc_N_TTY);
/*
- * Set up the standard termios. Individual tty drivers may
- * deviate from this; this is used as a template.
- */
- memset(&tty_std_termios, 0, sizeof(struct termios));
- memcpy(tty_std_termios.c_cc, INIT_C_CC, NCCS);
- tty_std_termios.c_iflag = ICRNL | IXON;
- tty_std_termios.c_oflag = OPOST | ONLCR;
- tty_std_termios.c_cflag = B38400 | CS8 | CREAD | HUPCL;
- tty_std_termios.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK |
- ECHOCTL | ECHOKE | IEXTEN;
-
- /*
* set up the console device so that later boot sequences can
* inform about problems etc..
*/
#ifdef CONFIG_EARLY_PRINTK
disable_early_printk();
#endif
-#ifdef CONFIG_VT
- con_init();
-#endif
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
- au1000_serial_console_init();
-#endif
-#ifdef CONFIG_SERIAL_CONSOLE
-#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
- console_8xx_init();
-#elif defined(CONFIG_MAC_SERIAL)
- mac_scc_console_init();
-#elif defined(CONFIG_PARISC)
- pdc_console_init();
-#elif defined(CONFIG_VAX)
- /* No explicit call required */
-#elif defined(CONFIG_SERIAL)
- serial_console_init();
-#endif /* CONFIG_8xx */
-#ifdef CONFIG_SGI_SERIAL
- sgi_serial_console_init();
-#endif
-#if defined(CONFIG_MVME162_SCC) || defined(CONFIG_BVME6000_SCC) || defined(CONFIG_MVME147_SCC)
- vme_scc_console_init();
-#endif
-#if defined(CONFIG_SERIAL167)
- serial167_console_init();
-#endif
-#if defined(CONFIG_SH_SCI)
- sci_console_init();
-#endif
-#endif
-#ifdef CONFIG_TN3270_CONSOLE
- tub3270_con_init();
-#endif
-#ifdef CONFIG_TN3215_CONSOLE
- con3215_init();
-#endif
-#ifdef CONFIG_SCLP_CONSOLE
- sclp_console_init();
-#endif
-#ifdef CONFIG_STDIO_CONSOLE
- stdio_console_init();
-#endif
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
- uart_console_init();
-#endif
-#ifdef CONFIG_ARC_CONSOLE
- arc_console_init();
-#endif
-#ifdef CONFIG_SERIAL_68328
- m68328_console_init();
-#endif
-#ifdef CONFIG_SERIAL_COLDFIRE
- mcfrs_console_init();
-#endif
#ifdef CONFIG_SERIAL_68360
- rs_360_init();
-#endif
-#ifdef CONFIG_SERIAL_TX3912_CONSOLE
- tx3912_console_init();
-#endif
-#ifdef CONFIG_HVC_CONSOLE
- hvc_console_init();
-#endif
+ /* This is not a console initcall. I know not what it's doing here.
+ So I haven't moved it. dwmw2 */
+ rs_360_init();
+#endif
+ call = &__con_initcall_start;
+ while (call < &__con_initcall_end) {
+ (*call)();
+ call++;
+ }
}
static struct tty_driver dev_tty_driver, dev_syscons_driver;
@@ -2309,14 +2235,19 @@
};
EXPORT_SYMBOL(tty_devclass);
+static int __init tty_devclass_init(void)
+{
+ return devclass_register(&tty_devclass);
+}
+
+postcore_initcall(tty_devclass_init);
+
/*
* Ok, now we can initialize the rest of the tty devices and can count
* on memory allocations, interrupts etc..
*/
void __init tty_init(void)
{
- devclass_register(&tty_devclass);
-
/*
* dev_tty_driver and dev_console_driver are actually magic
* devices which get redirected at open time. Nevertheless,
--- amd768_rng.c DELETED ---
--- i810_rng.c DELETED ---
|
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:04:05
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/isdn/hisax In directory sc8-pr-cvs1:/tmp/cvs-serv20755/drivers/isdn/hisax Removed Files: amd7930.c Log Message: Merge with 2.5.65 --- amd7930.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-24 12:04:05
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv20755/drivers Modified Files: Makefile Log Message: Merge with 2.5.65 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Makefile 19 Aug 2003 12:56:19 -0000 1.20 +++ Makefile 24 Aug 2003 12:04:03 -0000 1.21 @@ -11,9 +11,13 @@ # PnP must come after ACPI since it will eventually need to check if acpi # was used and do nothing if so obj-$(CONFIG_PNP) += pnp/ + +# char/ comes before serial/ etc so that the VT console is the boot-time +# default. +obj-y += char/ obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ -obj-y += base/ char/ block/ misc/ net/ media/ +obj-y += base/ block/ misc/ net/ media/ obj-$(CONFIG_NUBUS) += nubus/ obj-$(CONFIG_ATM) += atm/ obj-$(CONFIG_IDE) += ide/ |
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:15:00
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv14661 Modified Files: Makefile Log Message: Merge with 2.5.64 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- Makefile 19 Aug 2003 20:41:13 -0000 1.71 +++ Makefile 23 Aug 2003 12:44:06 -0000 1.72 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 63 +SUBLEVEL = 64 EXTRAVERSION = # *DOCUMENTATION* @@ -159,7 +159,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump AWK = awk -GENKSYMS = /sbin/genksyms +GENKSYMS = scripts/genksyms/genksyms DEPMOD = /sbin/depmod KALLSYMS = scripts/kallsyms PERL = perl @@ -190,11 +190,12 @@ # The temporary file to save gcc -MD generated dependencies must not # contain a comma +comma := , depfile = $(subst $(comma),_,$(@D)/.$(@F).d) noconfig_targets := xconfig menuconfig config oldconfig randconfig \ defconfig allyesconfig allnoconfig allmodconfig \ - clean mrproper distclean \ + clean mrproper distclean rpm \ help tags TAGS cscope sgmldocs psdocs pdfdocs htmldocs \ checkconfig checkhelp checkincludes @@ -319,36 +320,31 @@ endef # set -e makes the rule exit immediately on error -# Final awk script makes sure per-cpu vars are in per-cpu section, as -# old gcc (eg egcs 2.92.11) ignores section attribute if uninitialized. define rule_vmlinux__ - set -e - $(if $(filter .tmp_kallsyms%,$^),, - echo ' Generating build number' - . $(src)/scripts/mkversion > .tmp_version - mv -f .tmp_version .version - $(Q)$(MAKE) $(build)=init + set -e; \ + $(if $(filter .tmp_kallsyms%,$^),, \ + echo ' GEN .version'; \ + . $(srctree)/scripts/mkversion > .tmp_version; \ + mv -f .tmp_version .version; \ + $(MAKE) $(build)=init; \ ) - $(call cmd,vmlinux__) + $(call cmd,vmlinux__); \ echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd endef -define rule_vmlinux_no_percpu - $(rule_vmlinux__) - $(NM) $@ | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map -endef - ifdef CONFIG_SMP +# Final awk script makes sure per-cpu vars are in per-cpu section, as +# old gcc (eg egcs 2.92.11) ignores section attribute if uninitialized. + +check_per_cpu = $(AWK) -f $(srctree)/scripts/per-cpu-check.awk < System.map +endif + define rule_vmlinux - $(rule_vmlinux_no_percpu) - $(AWK) -f $(srctree)/scripts/per-cpu-check.awk < System.map -endef -else -define rule_vmlinux - $(rule_vmlinux_no_percpu) + $(rule_vmlinux__) + $(NM) $@ | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map + $(check_per_cpu) endef -endif LDFLAGS_vmlinux += -T arch/$(ARCH)/vmlinux.lds.s @@ -377,7 +373,7 @@ $(call cmd,kallsyms) .tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/vmlinux.lds.s FORCE - $(call if_changed_rule,vmlinux__) + +$(call if_changed_rule,vmlinux__) .tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/vmlinux.lds.s FORCE $(call if_changed_rule,vmlinux__) @@ -457,14 +453,14 @@ # Split autoconf.h into include/linux/config/* include/config/MARKER: scripts/split-include include/linux/autoconf.h - @echo ' SPLIT include/linux/autoconf.h -> include/config/*' + @echo ' SPLIT include/linux/autoconf.h -> include/config/*' @scripts/split-include include/linux/autoconf.h include/config @touch $@ # if .config is newer than include/linux/autoconf.h, someone tinkered # with it and forgot to run make oldconfig -include/linux/autoconf.h: .config +include/linux/autoconf.h: .config scripts/fixdep $(Q)$(MAKE) $(build)=scripts/kconfig scripts/kconfig/conf ./scripts/kconfig/conf -s arch/$(ARCH)/Kconfig @@ -481,7 +477,7 @@ echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \ exit 1; \ fi; - @echo -n ' Generating $@' + @echo -n ' GEN $@' @(echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; \ echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)`; \ echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \ @@ -506,7 +502,7 @@ # Build modules .PHONY: modules -modules: $(SUBDIRS) $(if $(CONFIG_MODVERSIONS),vmlinux) +modules: $(SUBDIRS) $(if $(KBUILD_BUILTIN),vmlinux) @echo ' Building modules, stage 2.'; $(Q)$(MAKE) -rR -f scripts/Makefile.modpost @@ -571,33 +567,6 @@ echo "#endif" ) endef -# RPM target -# --------------------------------------------------------------------------- - -# If you do a make spec before packing the tarball you can rpm -ta it - -spec: - . scripts/mkspec >kernel.spec - -# Build a tar ball, generate an rpm from it and pack the result -# There arw two bits of magic here -# 1) The use of /. to avoid tar packing just the symlink -# 2) Removing the .dep files as they have source paths in them that -# will become invalid - -rpm: clean spec - find . $(RCS_FIND_IGNORE) \ - \( -size 0 -o -name .depend -o -name .hdepend\) \ - -type f -print | xargs rm -f - set -e; \ - cd $(TOPDIR)/.. ; \ - ln -sf $(TOPDIR) $(KERNELPATH) ; \ - tar -cvz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \ - rm $(KERNELPATH) ; \ - cd $(TOPDIR) ; \ - $(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \ - rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ - rm $(TOPDIR)/../$(KERNELPATH).tar.gz else # ifdef include_config @@ -630,7 +599,7 @@ # --------------------------------------------------------------------------- .PHONY: oldconfig xconfig menuconfig config \ - make_with_config + make_with_config rpm scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf: scripts/fixdep FORCE $(Q)$(MAKE) $(build)=scripts/kconfig $@ @@ -764,6 +733,36 @@ tags: FORCE $(call cmd,tags) +# RPM target +# --------------------------------------------------------------------------- + +# If you do a make spec before packing the tarball you can rpm -ta it + +spec: + . $(srctree)/scripts/mkspec >kernel.spec + +# Build a tar ball, generate an rpm from it and pack the result +# There are two bits of magic here +# 1) The use of /. to avoid tar packing just the symlink +# 2) Removing the .dep files as they have source paths in them that +# will become invalid + +rpm: clean spec + find . $(RCS_FIND_IGNORE) \ + \( -size 0 -o -name .depend -o -name .hdepend \) \ + -type f -print | xargs rm -f + set -e; \ + cd $(TOPDIR)/.. ; \ + ln -sf $(TOPDIR) $(KERNELPATH) ; \ + tar -cvz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \ + rm $(KERNELPATH) ; \ + cd $(TOPDIR) ; \ + $(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \ + RPM=`which rpmbuild`; \ + if [ -z "$$RPM" ]; then RPM=rpm; fi; \ + $$RPM -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ + rm $(TOPDIR)/../$(KERNELPATH).tar.gz + # Brief documentation of the typical targets used # --------------------------------------------------------------------------- @@ -783,7 +782,6 @@ @echo '' @echo 'Other generic targets:' @echo ' all - Build all targets marked with [*]' - @echo ' dep - Create module version information' @echo '* vmlinux - Build the bare kernel' @echo '* modules - Build all modules' @echo ' dir/file.[ois]- Build specified target only' @@ -803,7 +801,7 @@ # Documentation targets # --------------------------------------------------------------------------- -sgmldocs psdocs pdfdocs htmldocs: scripts +sgmldocs psdocs pdfdocs htmldocs: scripts/docproc FORCE $(Q)$(MAKE) $(build)=Documentation/DocBook $@ # Scripts to check various things for consistency @@ -813,11 +811,6 @@ find * $(RCS_FIND_IGNORE) \ -name '*.[hcS]' -type f -print | sort \ | xargs $(PERL) -w scripts/checkconfig.pl - -checkhelp: - find * $(RCS_FIND_IGNORE) \ - -name [cC]onfig.in -print | sort \ - | xargs $(PERL) -w scripts/checkhelp.pl checkincludes: find * $(RCS_FIND_IGNORE) \ |
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:14:05
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1:/tmp/cvs-serv14661/drivers/scsi Modified Files: Makefile scsi_ioctl.c Log Message: Merge with 2.5.64 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile 19 Aug 2003 20:41:13 -0000 1.22 +++ Makefile 23 Aug 2003 12:44:06 -0000 1.23 @@ -126,13 +126,11 @@ obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o 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_sysfs.o - -ifdef CONFIG_PROC_FS -scsi_mod-objs += scsi_proc.o -endif +scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ + scsicam.o scsi_error.o scsi_lib.o \ + scsi_scan.o scsi_syms.o scsi_sysfs.o +scsi_mod-$(CONFIG_PROC_FS) += scsi_proc.o +scsi_mod-$(CONFIG_X86_PC9800) += scsi_pc98.o sd_mod-objs := sd.o sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o Index: scsi_ioctl.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scsi_ioctl.c 7 Jul 2003 23:47:31 -0000 1.11 +++ scsi_ioctl.c 23 Aug 2003 12:44:06 -0000 1.12 @@ -194,7 +194,7 @@ * of the given command. There is no way to override this. * - Data transfers are limited to PAGE_SIZE (4K on i386, 8K on alpha). * - The length (x + y) must be at least OMAX_SB_LEN bytes long to - * accomodate the sense buffer when an error occurs. + * accommodate the sense buffer when an error occurs. * The sense buffer is truncated to OMAX_SB_LEN (16) bytes so that * old code will not be surprised. * - If a Unix error occurs (e.g. ENOMEM) then the user will receive |
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:09:16
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv14239/Documentation Removed Files: cpufreq Log Message: Merge with 2.5.64 --- cpufreq DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:06:56
|
Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1:/tmp/cvs-serv14661/init
Modified Files:
do_mounts.c
Log Message:
Merge with 2.5.64
Index: do_mounts.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/do_mounts.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- do_mounts.c 4 Aug 2003 12:18:14 -0000 1.7
+++ do_mounts.c 23 Aug 2003 12:44:06 -0000 1.8
@@ -1,77 +1,28 @@
-#define __KERNEL_SYSCALLS__
-#include <linux/config.h>
-#include <linux/kernel.h>
#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/devfs_fs_kernel.h>
-#include <linux/unistd.h>
#include <linux/ctype.h>
-#include <linux/blk.h>
#include <linux/fd.h>
#include <linux/tty.h>
[...1137 lines suppressed...]
-__setup("raid=", raid_setup);
-__setup("md=", md_setup);
-#endif
-
-static void __init md_run_setup(void)
-{
-#ifdef CONFIG_BLK_DEV_MD
- create_dev("/dev/md0", MKDEV(MD_MAJOR, 0), "md/0");
- if (raid_setup_args.noautodetect)
- printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
- else {
- int fd = open("/dev/md0", 0, 0);
- if (fd >= 0) {
- sys_ioctl(fd, RAID_AUTORUN, 0);
- close(fd);
- }
- }
- md_setup_drive();
-#endif
-}
|
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:02:03
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net/pcmcia In directory sc8-pr-cvs1:/tmp/cvs-serv14796/drivers/net/pcmcia Removed Files: aironet4500_cs.c Log Message: Merge with 2.5.64 --- aironet4500_cs.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:01:25
|
Update of /cvsroot/linux-vax/kernel-2.5/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv14661/scripts Modified Files: Makefile.build Log Message: Merge with 2.5.64 Index: Makefile.build =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.build 19 Aug 2003 12:56:24 -0000 1.10 +++ Makefile.build 23 Aug 2003 12:44:07 -0000 1.11 @@ -90,8 +90,7 @@ mv $(@D)/.tmp_$(@F) $@; \ else \ $(CPP) -D__GENKSYMS__ $(c_flags) $< \ - | $(GENKSYMS) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) \ - | sed -n 's/\#define __ver_\([^ ]*\)[ ]*\([^ ]*\)/__crc_\1 = 0x\2 ;/gp' \ + | $(GENKSYMS) \ > $(@D)/.tmp_$(@F:.o=.ver); \ \ $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \ |
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:01:24
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv14661/drivers/char
Modified Files:
Makefile tty_io.c
Log Message:
Merge with 2.5.64
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile 4 Aug 2003 12:18:14 -0000 1.35
+++ Makefile 23 Aug 2003 12:44:06 -0000 1.36
@@ -85,7 +85,7 @@
clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
- $(call do_cmd,CONMK $@,$(objtree)/scripts/conmakehash $< > $@)
+ $(call do_cmd,CONMK $@,$(objtree)/scripts/conmakehash $< > $@)
$(obj)/defkeymap.o: $(obj)/defkeymap.c
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tty_io.c 19 Aug 2003 20:41:13 -0000 1.21
+++ tty_io.c 23 Aug 2003 12:44:06 -0000 1.22
@@ -1944,27 +1944,25 @@
schedule_delayed_work(&tty->flip.work, 1);
return;
}
+
+ spin_lock_irqsave(&tty->read_lock, flags);
if (tty->flip.buf_num) {
cp = tty->flip.char_buf + TTY_FLIPBUF_SIZE;
fp = tty->flip.flag_buf + TTY_FLIPBUF_SIZE;
tty->flip.buf_num = 0;
-
- local_irq_save(flags); // FIXME: is this safe?
tty->flip.char_buf_ptr = tty->flip.char_buf;
tty->flip.flag_buf_ptr = tty->flip.flag_buf;
} else {
cp = tty->flip.char_buf;
fp = tty->flip.flag_buf;
tty->flip.buf_num = 1;
-
- local_irq_save(flags); // FIXME: is this safe?
tty->flip.char_buf_ptr = tty->flip.char_buf + TTY_FLIPBUF_SIZE;
tty->flip.flag_buf_ptr = tty->flip.flag_buf + TTY_FLIPBUF_SIZE;
}
count = tty->flip.count;
tty->flip.count = 0;
- local_irq_restore(flags); // FIXME: is this safe?
-
+ spin_unlock_irqrestore(&tty->read_lock, flags);
+
tty->ldisc.receive_buf(tty, cp, fp, count);
}
|
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:00:17
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/arm/XScale/IOP310 In directory sc8-pr-cvs1:/tmp/cvs-serv14239/Documentation/arm/XScale/IOP310 Removed Files: IQ80310 Log Message: Merge with 2.5.64 --- IQ80310 DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-08-23 14:00:16
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux In directory sc8-pr-cvs1:/tmp/cvs-serv14239/include/linux Removed Files: ghash.h Log Message: Merge with 2.5.64 --- ghash.h DELETED --- |
