linux-vax-commit — [LIST CLOSED] Notifications of commits to complete Linux/VAX CVS tree

[LV-commit] CVS: kernel-2.5/include/linux elf.h,1.5,1.6 logibusmouse.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/include/linux

Modified Files:
	elf.h 
Removed Files:
	logibusmouse.h 
Log Message:
Merge with 2.5.48


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- elf.h	15 Jun 2003 23:31:28 -0000	1.5
+++ elf.h	19 Jun 2003 23:31:47 -0000	1.6
@@ -1,7 +1,6 @@
 #ifndef _LINUX_ELF_H
 #define _LINUX_ELF_H
 
-#include <linux/sched.h>
 #include <linux/types.h>
 #include <asm/elf.h>
 
@@ -200,6 +199,9 @@
 #define ELF32_R_SYM(x) ((x) >> 8)
 #define ELF32_R_TYPE(x) ((x) & 0xff)
 
+#define ELF64_R_SYM(i)			((i) >> 32)
+#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
+
 #define R_386_NONE	0
 #define R_386_32	1
 #define R_386_PC32	2
@@ -297,6 +299,7 @@
 #define R_SPARC_PCPLT10		29
 #define R_SPARC_10		30
 #define R_SPARC_11		31
+#define R_SPARC_64		32
 #define R_SPARC_WDISP16		40
 #define R_SPARC_WDISP19		41
 #define R_SPARC_7		43
@@ -370,6 +373,47 @@
 #define R_ALPHA_GLOB_DAT        25      /* Create GOT entry */
 #define R_ALPHA_JMP_SLOT        26      /* Create PLT entry */
 #define R_ALPHA_RELATIVE        27      /* Adjust by program base */
+
+/* PowerPC relocations defined by the ABIs */
+#define R_PPC_NONE		0
+#define R_PPC_ADDR32		1	/* 32bit absolute address */
+#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
+#define R_PPC_ADDR16		3	/* 16bit absolute address */
+#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
+#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
+#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
+#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
+#define R_PPC_ADDR14_BRTAKEN	8
+#define R_PPC_ADDR14_BRNTAKEN	9
+#define R_PPC_REL24		10	/* PC relative 26 bit */
+#define R_PPC_REL14		11	/* PC relative 16 bit */
+#define R_PPC_REL14_BRTAKEN	12
+#define R_PPC_REL14_BRNTAKEN	13
+#define R_PPC_GOT16		14
+#define R_PPC_GOT16_LO		15
+#define R_PPC_GOT16_HI		16
+#define R_PPC_GOT16_HA		17
+#define R_PPC_PLTREL24		18
+#define R_PPC_COPY		19
+#define R_PPC_GLOB_DAT		20
+#define R_PPC_JMP_SLOT		21
+#define R_PPC_RELATIVE		22
+#define R_PPC_LOCAL24PC		23
+#define R_PPC_UADDR32		24
+#define R_PPC_UADDR16		25
+#define R_PPC_REL32		26
+#define R_PPC_PLT32		27
+#define R_PPC_PLTREL32		28
+#define R_PPC_PLT16_LO		29
+#define R_PPC_PLT16_HI		30
+#define R_PPC_PLT16_HA		31
+#define R_PPC_SDAREL16		32
+#define R_PPC_SECTOFF		33
+#define R_PPC_SECTOFF_LO	34
+#define R_PPC_SECTOFF_HI	35
+#define R_PPC_SECTOFF_HA	36
+/* Keep this the last entry.  */
+#define R_PPC_NUM		37
 
 /* Legal values for e_flags field of Elf64_Ehdr.  */
 

--- logibusmouse.h DELETED ---

[LV-commit] CVS: kernel-2.5/init do_mounts.c,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/init

Modified Files:
	do_mounts.c 
Log Message:
Merge with 2.5.48


Index: do_mounts.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/do_mounts.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- do_mounts.c	18 May 2003 18:25:23 -0000	1.2
+++ do_mounts.c	19 Jun 2003 23:31:47 -0000	1.3
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/suspend.h>
 #include <linux/root_dev.h>
+#include <linux/mount.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -20,6 +21,8 @@
 #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
 
+#include <linux/raid/md.h>
+
 #define BUILD_CRAMDISK
 
 extern int get_filesystem_list(char * buf);
@@ -36,6 +39,10 @@
 extern asmlinkage long sys_mknod(const char *name, int mode, dev_t dev);
 extern asmlinkage long sys_umount(char *name, int flags);
 extern asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg);
+extern asmlinkage long sys_access(const char * filename, int mode);
+extern asmlinkage long sys_newstat(char * filename, struct stat * statbuf);
+extern asmlinkage long sys_getdents64(unsigned int fd, void * dirent,
+	unsigned int count);
 
 #ifdef CONFIG_BLK_DEV_INITRD
 unsigned int real_root_dev;	/* do_proc_dointvec cannot handle kdev_t */
@@ -315,25 +322,125 @@
 }
 #endif
 
+#ifdef CONFIG_DEVFS_FS
+static int __init do_read_dir(int fd, void *buf, int len)
+{
+	long bytes, n;
+	char *p = buf;
+	lseek(fd, 0, 0);
+
+	for (bytes = 0, p = buf; bytes < len; bytes += n, p+=n) {
+		n = sys_getdents64(fd, p, len - bytes);
+		if (n < 0)
+			return -1;
+		if (n == 0)
+			return bytes;
+	}
+	return 0;
+}
+
+static void * __init read_dir(char *path, int *len)
+{
+	int size;
+	int fd = open(path, 0, 0);
+
+	*len = 0;
+	if (fd < 0)
+		return NULL;
+
+	for (size = 1<<9; size < (1<<18); size <<= 1) {
+		void *p = kmalloc(size, GFP_KERNEL);
+		int n;
+		if (!p)
+			break;
+		n = do_read_dir(fd, p, size);
+		if (n > 0) {
+			close(fd);
+			*len = n;
+			return p;
+		}
+		kfree(p);
+		if (n < 0)
+			break;
+	}
+	close(fd);
+	return NULL;
+}
+#endif
+
+struct linux_dirent64 {
+	u64		d_ino;
+	s64		d_off;
+	unsigned short	d_reclen;
+	unsigned char	d_type;
+	char		d_name[0];
+};
+
+static int __init find_in_devfs(char *path, dev_t dev)
+{
+#ifdef CONFIG_DEVFS_FS
+	struct stat buf;
+	char *end = path + strlen(path);
+	int rest = path + 64 - end;
+	int size;
+	char *p = read_dir(path, &size);
+	char *s;
+
+	if (!p)
+		return -1;
+	for (s = p; s < p + size; s += ((struct linux_dirent64 *)s)->d_reclen) {
+		struct linux_dirent64 *d = (struct linux_dirent64 *)s;
+		if (strlen(d->d_name) + 2 > rest)
+			continue;
+		switch (d->d_type) {
+			case DT_BLK:
+				sprintf(end, "/%s", d->d_name);
+				if (sys_newstat(path, &buf) < 0)
+					break;
+				if (!S_ISBLK(buf.st_mode))
+					break;
+				if (buf.st_rdev != dev)
+					break;
+				kfree(p);
+				return 0;
+			case DT_DIR:
+				if (strcmp(d->d_name, ".") == 0)
+					break;
+				if (strcmp(d->d_name, "..") == 0)
+					break;
+				sprintf(end, "/%s", d->d_name);
+				if (find_in_devfs(path, dev) < 0)
+					break;
+				kfree(p);
+				return 0;
+		}
+	}
+	kfree(p);
+#endif
+	return -1;
+}
+
 static int __init create_dev(char *name, dev_t dev, char *devfs_name)
 {
-	void *handle;
 	char path[64];
-	int n;
 
 	sys_unlink(name);
 	if (!do_devfs)
 		return sys_mknod(name, S_IFBLK|0600, dev);
 
-	handle = devfs_get_handle(NULL, !dev ? devfs_name : NULL,
-				  MAJOR(dev), MINOR(dev), DEVFS_SPECIAL_BLK, 1);
-	if (!handle)
+	if (devfs_name && devfs_name[0]) {
+		if (strncmp(devfs_name, "/dev/", 5) == 0)
+			devfs_name += 5;
+		sprintf(path, "/dev/%s", devfs_name);
+		if (sys_access(path, 0) == 0)
+			return sys_symlink(devfs_name, name);
+	}
+	if (!dev)
 		return -1;
-	n = devfs_generate_path(handle, path + 5, sizeof (path) - 5);
-	devfs_put(handle);
-	if (n < 0)
+	strcpy(path, "/dev");
+	if (find_in_devfs(path, dev) < 0)
 		return -1;
-	return sys_symlink(path + n + 5, name);
+	return sys_symlink(path + 5, name);
 }
 
 #if defined(CONFIG_BLK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)
@@ -730,12 +837,22 @@
 	return rd_load_image("/dev/initrd");
 }
 
+static void __init md_run_setup(void);
+
 /*
  * Prepare the namespace - decide what/where to mount, load ramdisks, etc.
  */
 void prepare_namespace(void)
 {
-	int is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR;
+	int is_floppy;
+
+#ifdef CONFIG_DEVFS_FS
+	sys_mount("devfs", "/dev", "devfs", 0, NULL);
+	do_devfs = 1;
+#endif
+
+	md_run_setup();
+
 	if (saved_root_name[0]) {
 		char *p = saved_root_name;
 		ROOT_DEV = name_to_dev_t(p);
@@ -743,24 +860,15 @@
 			p += 5;
 		strcpy(root_device_name, p);
 	}
+
+	is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR;
+
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (!initrd_start)
 		mount_initrd = 0;
 	real_root_dev = ROOT_DEV;
 #endif
 
-/* These were removed in 2.5.46 but I've temporarily re-instated them
-   until initramfs creation is fixed up in 2.5.47 - KPH */
-	sys_mkdir("/dev", 0700);
-	sys_mkdir("/root", 0700);
-	sys_mknod("/dev/console", S_IFCHR|0600, MKDEV(TTYAUX_MAJOR, 1));
-/* End */
-
-#ifdef CONFIG_DEVFS_FS
-	sys_mount("devfs", "/dev", "devfs", 0, NULL);
-	do_devfs = 1;
-#endif
-
 	create_dev("/dev/root", ROOT_DEV, NULL);
 
 	/* This has to be before mounting root, because even readonly mount of reiserfs would replay
@@ -929,3 +1037,260 @@
 }
 
 #endif  /* BUILD_CRAMDISK && CONFIG_BLK_DEV_RAM */
+
+#ifdef CONFIG_BLK_DEV_MD
+
+/*
+ * When md (and any require personalities) are compiled into the kernel
+ * (not a module), arrays can be assembles are boot time using with AUTODETECT
+ * where specially marked partitions are registered with md_autodetect_dev(),
+ * and with MD_BOOT where devices to be collected are given on the boot line
+ * with md=.....
+ * The code for that is here.
+ */
+
+struct {
+	int set;
+	int noautodetect;
+} raid_setup_args __initdata;
+
+static struct {
+	char device_set [MAX_MD_DEVS];
+	int pers[MAX_MD_DEVS];
+	int chunk[MAX_MD_DEVS];
+	char *device_names[MAX_MD_DEVS];
+} md_setup_args __initdata;
+
+/*
+ * Parse the command-line parameters given our kernel, but do not
+ * actually try to invoke the MD device now; that is handled by
+ * md_setup_drive after the low-level disk drivers have initialised.
+ *
+ * 27/11/1999: Fixed to work correctly with the 2.3 kernel (which
+ *             assigns the task of parsing integer arguments to the
+ *             invoked program now).  Added ability to initialise all
+ *             the MD devices (by specifying multiple "md=" lines)
+ *             instead of just one.  -- KTK
+ * 18May2000: Added support for persistent-superblock arrays:
+ *             md=n,0,factor,fault,device-list   uses RAID0 for device n
+ *             md=n,-1,factor,fault,device-list  uses LINEAR for device n
+ *             md=n,device-list      reads a RAID superblock from the devices
+ *             elements in device-list are read by name_to_kdev_t so can be
+ *             a hex number or something like /dev/hda1 /dev/sdb
+ * 2001-06-03: Dave Cinege <dc...@ps...>
+ *		Shifted name_to_kdev_t() and related operations to md_set_drive()
+ *		for later execution. Rewrote section to make devfs compatible.
+ */
+static int __init md_setup(char *str)
+{
+	int minor, level, factor, fault, pers;
+	char *pername = "";
+	char *str1 = str;
+
+	if (get_option(&str, &minor) != 2) {	/* MD Number */
+		printk(KERN_WARNING "md: Too few arguments supplied to md=.\n");
+		return 0;
+	}
+	if (minor >= MAX_MD_DEVS) {
+		printk(KERN_WARNING "md: md=%d, Minor device number too high.\n", minor);
+		return 0;
+	} else if (md_setup_args.device_names[minor]) {
+		printk(KERN_WARNING "md: md=%d, Specified more than once. "
+		       "Replacing previous definition.\n", minor);
+	}
+	switch (get_option(&str, &level)) {	/* RAID Personality */
+	case 2: /* could be 0 or -1.. */
+		if (level == 0 || level == LEVEL_LINEAR) {
+			if (get_option(&str, &factor) != 2 ||	/* Chunk Size */
+					get_option(&str, &fault) != 2) {
+				printk(KERN_WARNING "md: Too few arguments supplied to md=.\n");
+				return 0;
+			}
+			md_setup_args.pers[minor] = level;
+			md_setup_args.chunk[minor] = 1 << (factor+12);
+			switch(level) {
+			case LEVEL_LINEAR:
+				pers = LINEAR;
+				pername = "linear";
+				break;
+			case 0:
+				pers = RAID0;
+				pername = "raid0";
+				break;
+			default:
+				printk(KERN_WARNING
+				       "md: The kernel has not been configured for raid%d support!\n",
+				       level);
+				return 0;
+			}
+			md_setup_args.pers[minor] = pers;
+			break;
+		}
+		/* FALL THROUGH */
+	case 1: /* the first device is numeric */
+		str = str1;
+		/* FALL THROUGH */
+	case 0:
+		md_setup_args.pers[minor] = 0;
+		pername="super-block";
+	}
+
+	printk(KERN_INFO "md: Will configure md%d (%s) from %s, below.\n",
+		minor, pername, str);
+	md_setup_args.device_names[minor] = str;
+
+	return 1;
+}
+static void __init md_setup_drive(void)
+{
+	int minor, i;
+	dev_t dev;
+	dev_t devices[MD_SB_DISKS+1];
+
+	for (minor = 0; minor < MAX_MD_DEVS; minor++) {
+		int fd;
+		int err = 0;
+		char *devname;
+		mdu_disk_info_t dinfo;
+		char name[16], devfs_name[16];
+
+		if (!(devname = md_setup_args.device_names[minor]))
+			continue;
+		
+		sprintf(name, "/dev/md%d", minor);
+		sprintf(devfs_name, "/dev/md/%d", minor);
+		create_dev(name, MKDEV(MD_MAJOR, minor), devfs_name);
+		for (i = 0; i < MD_SB_DISKS && devname != 0; i++) {
+			char *p;
+			char comp_name[64];
+			struct stat buf;
+
+			p = strchr(devname, ',');
+			if (p)
+				*p++ = 0;
+
+			dev = name_to_dev_t(devname);
+			if (strncmp(devname, "/dev/", 5))
+				devname += 5;
+			snprintf(comp_name, 63, "/dev/%s", devname);
+			if (sys_newstat(comp_name, &buf) == 0 &&
+							S_ISBLK(buf.st_mode))
+				dev = buf.st_rdev;
+			if (!dev) {
+				printk(KERN_WARNING "md: Unknown device name: %s\n", devname);
+				break;
+			}
+
+			devices[i] = dev;
+			md_setup_args.device_set[minor] = 1;
+
+			devname = p;
+		}
+		devices[i] = 0;
+
+		if (!md_setup_args.device_set[minor])
+			continue;
+
+		printk(KERN_INFO "md: Loading md%d: %s\n", minor, md_setup_args.device_names[minor]);
+
+		fd = open(name, 0, 0);
+		if (fd < 0) {
+			printk(KERN_ERR "md: open failed - cannot start array %d\n", minor);
+			continue;
+		}
+		if (sys_ioctl(fd, SET_ARRAY_INFO, 0) == -EBUSY) {
+			printk(KERN_WARNING
+			       "md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n",
+			       minor);
+			close(fd);
+			continue;
+		}
+
+		if (md_setup_args.pers[minor]) {
+			/* non-persistent */
+			mdu_array_info_t ainfo;
+			ainfo.level = pers_to_level(md_setup_args.pers[minor]);
+			ainfo.size = 0;
+			ainfo.nr_disks =0;
+			ainfo.raid_disks =0;
+			while (devices[ainfo.raid_disks])
+				ainfo.raid_disks++;
+			ainfo.md_minor =minor;
+			ainfo.not_persistent = 1;
+
+			ainfo.state = (1 << MD_SB_CLEAN);
+			ainfo.layout = 0;
+			ainfo.chunk_size = md_setup_args.chunk[minor];
+			err = sys_ioctl(fd, SET_ARRAY_INFO, (long)&ainfo);
+			for (i = 0; !err && i <= MD_SB_DISKS; i++) {
+				dev = devices[i];
+				if (!dev)
+					break;
+				dinfo.number = i;
+				dinfo.raid_disk = i;
+				dinfo.state = (1<<MD_DISK_ACTIVE)|(1<<MD_DISK_SYNC);
+				dinfo.major = MAJOR(dev);
+				dinfo.minor = MINOR(dev);
+				err = sys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo);
+			}
+		} else {
+			/* persistent */
+			for (i = 0; i <= MD_SB_DISKS; i++) {
+				dev = devices[i];
+				if (!dev)
+					break;
+				dinfo.major = MAJOR(dev);
+				dinfo.minor = MINOR(dev);
+				sys_ioctl(fd, ADD_NEW_DISK, (long)&dinfo);
+			}
+		}
+		if (!err)
+			err = sys_ioctl(fd, RUN_ARRAY, 0);
+		if (err)
+			printk(KERN_WARNING "md: starting md%d failed\n", minor);
+		close(fd);
+	}
+}
+
+static int __init raid_setup(char *str)
+{
+	int len, pos;
+
+	len = strlen(str) + 1;
+	pos = 0;
+
+	while (pos < len) {
+		char *comma = strchr(str+pos, ',');
+		int wlen;
+		if (comma)
+			wlen = (comma-str)-pos;
+		else	wlen = (len-1)-pos;
+
+		if (!strncmp(str, "noautodetect", wlen))
+			raid_setup_args.noautodetect = 1;
+		pos += wlen+1;
+	}
+	raid_setup_args.set = 1;
+	return 1;
+}
+
+__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
+}

[LV-commit] CVS: kernel-2.5/scripts Makefile.build,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/scripts

Modified Files:
	Makefile.build 
Log Message:
Merge with 2.5.48


Index: Makefile.build
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.build	11 May 2003 20:28:23 -0000	1.3
+++ Makefile.build	19 Jun 2003 23:31:48 -0000	1.4
@@ -53,28 +53,44 @@
 
 # Default is built-in, unless we know otherwise
 modkern_cflags := $(CFLAGS_KERNEL)
+quiet_modtag := $(empty)   $(empty)
 
 $(real-objs-m)        : modkern_cflags := $(CFLAGS_MODULE)
 $(real-objs-m:.o=.i)  : modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.s)  : modkern_cflags := $(CFLAGS_MODULE)
 $(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE)
 
+$(real-objs-m)        : quiet_modtag := [M]
+$(real-objs-m:.o=.i)  : quiet_modtag := [M]
+$(real-objs-m:.o=.s)  : quiet_modtag := [M]
+$(real-objs-m:.o=.lst): quiet_modtag := [M]
+
+$(obj-m)              : quiet_modtag := [M]
+
 $(export-objs)        : export_flags   := $(EXPORT_FLAGS)
 $(export-objs:.o=.i)  : export_flags   := $(EXPORT_FLAGS)
 $(export-objs:.o=.s)  : export_flags   := $(EXPORT_FLAGS)
 $(export-objs:.o=.lst): export_flags   := $(EXPORT_FLAGS)
 
-c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \
-	  $(modkern_cflags) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) \
-	  -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) \
-	  $(export_flags) 
+# Default for not multi-part modules
+modname = $(*F)
+
+$(multi-objs-m)         : modname = $(modname-multi)
+$(multi-objs-m:.o=.i)   : modname = $(modname-multi)
+$(multi-objs-m:.o=.s)   : modname = $(modname-multi)
+$(multi-objs-m:.o=.lst) : modname = $(modname-multi)
+$(multi-objs-y)         : modname = $(modname-multi)
+$(multi-objs-y:.o=.i)   : modname = $(modname-multi)
+$(multi-objs-y:.o=.s)   : modname = $(modname-multi)
+$(multi-objs-y:.o=.lst) : modname = $(modname-multi)
 
-quiet_cmd_cc_s_c = CC      $@
+quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
 cmd_cc_s_c       = $(CC) $(c_flags) -S -o $@ $< 
 
 %.s: %.c FORCE
 	$(call if_changed_dep,cc_s_c)
 
-quiet_cmd_cc_i_c = CPP     $@
+quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
 cmd_cc_i_c       = $(CPP) $(c_flags)   -o $@ $<
 
 %.i: %.c FORCE
@@ -83,7 +99,7 @@
 # define listing_o_c to get compiler listings from .c -> .o compilations
 listing_o_c = -Wa,-adnhls=$(subst $(comma),_,$(@D)/$(*F)).lst -g
 
-quiet_cmd_cc_o_c = CC      $@
+quiet_cmd_cc_o_c = CC $(quiet_modtag)  $@
 cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $< $(listing_o_c)
 
 %.o: %.c FORCE
@@ -106,13 +122,13 @@
 a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \
 	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
 
-quiet_cmd_as_s_S = CPP     $@
+quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
 cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
 
 %.s: %.S FORCE
 	$(call if_changed_dep,as_s_S)
 
-quiet_cmd_as_o_S = AS      $@
+quiet_cmd_as_o_S = AS $(quiet_modtag)  $@
 cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
 
 %.o: %.S FORCE
@@ -159,7 +175,7 @@
 # Rule to link composite objects
 #
 
-quiet_cmd_link_multi = LD      $@
+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)))),$^)
 
 # We would rather have a list of rules like

[LV-commit] CVS: kernel-2.5 Makefile,1.55,1.56

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv16009

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.48


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Makefile	15 Jun 2003 23:28:13 -0000	1.55
+++ Makefile	19 Jun 2003 23:31:46 -0000	1.56
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 47
+SUBLEVEL = 48
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -157,7 +157,6 @@
 OBJDUMP		= $(CROSS_COMPILE)objdump
 AWK		= awk
 GENKSYMS	= /sbin/genksyms
-DEPMOD		= /sbin/depmod
 KALLSYMS	= /sbin/kallsyms
 PERL		= perl
 MODFLAGS	= -DMODULE
@@ -516,7 +515,7 @@
 #	Install modules
 
 .PHONY: modules_install
-modules_install: _modinst_ $(patsubst %, _modinst_%, $(SUBDIRS)) _modinst_post
+modules_install: _modinst_ $(patsubst %, _modinst_%, $(SUBDIRS))
 
 .PHONY: _modinst_
 _modinst_:
@@ -524,20 +523,6 @@
 	@rm -f $(MODLIB)/build
 	@mkdir -p $(MODLIB)/kernel
 	@ln -s $(TOPDIR) $(MODLIB)/build
-
-# If System.map exists, run depmod.  This deliberately does not have a
-# dependency on System.map since that would run the dependency tree on
-# vmlinux.  This depmod is only for convenience to give the initial
-# boot a modules.dep even before / is mounted read-write.  However the
-# boot script depmod is the master version.
-ifeq "$(strip $(INSTALL_MOD_PATH))" ""
-depmod_opts	:=
-else
-depmod_opts	:= -b $(INSTALL_MOD_PATH) -r
-endif
-.PHONY: _modinst_post
-_modinst_post:
-	if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi
 
 .PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
 $(patsubst %, _modinst_%, $(SUBDIRS)) :

[LV-commit] CVS: kernel-2.5/drivers/scsi Makefile,1.15,1.16 ChangeLog,1.1.1.1,NONE ChangeLog.ips,1.1.1.2,NONE ChangeLog.ncr53c8xx,1.1.1.1,NONE ChangeLog.serverraid,1.1.1.1,NONE ChangeLog.sym53c8xx,1.1.1.1,NONE LICENSE.FlashPoint,1.1.1.1,NONE README.53c700,1.1.1.1,NONE README.AM53C974,1.1.1.1,NONE README.BusLogic,1.1.1.1,NONE README.FlashPoint,1.1.1.1,NONE README.Mylex,1.1.1.1,NONE README.aha152x,1.1.1.1,NONE README.aic7xxx,1.1.1.1,NONE README.dpti,1.1.1.1,NONE README.dtc3x80,1.1.1.1,NONE README.g_NCR5380,1.1.1.1,NONE README.ibmmca,1.1.1.1,NONE README.in2000,1.1.1.1,NONE README.ncr53c7xx,1.1.1.1,NONE README.ncr53c8xx,1.1.1.2,NONE README.osst,1.1.1.1,NONE README.ppa,1.1.1.1,NONE README.qlogicfas,1.1.1.1,NONE README.qlogicisp,1.1.1.1,NONE README.st,1.1.1.5,NONE README.tmscsim,1.1.1.1,NONE cpqfc.Readme,1.1.1.4,NONE scsi_mid_low_api.txt,1.1.1.5,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/drivers/scsi

Modified Files:
	Makefile 
Removed Files:
	ChangeLog ChangeLog.ips ChangeLog.ncr53c8xx 
	ChangeLog.serverraid ChangeLog.sym53c8xx LICENSE.FlashPoint 
	README.53c700 README.AM53C974 README.BusLogic 
	README.FlashPoint README.Mylex README.aha152x README.aic7xxx 
	README.dpti README.dtc3x80 README.g_NCR5380 README.ibmmca 
	README.in2000 README.ncr53c7xx README.ncr53c8xx README.osst 
	README.ppa README.qlogicfas README.qlogicisp README.st 
	README.tmscsim cpqfc.Readme scsi_mid_low_api.txt 
Log Message:
Merge with 2.5.48


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile	11 May 2003 20:28:23 -0000	1.15
+++ Makefile	19 Jun 2003 23:31:47 -0000	1.16
@@ -18,7 +18,7 @@
 CFLAGS_gdth.o    = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
 CFLAGS_seagate.o =   -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
 
-export-objs	:= scsi_syms.o 53c700.o
+export-objs	:= scsi_syms.o scsi_proc.o 53c700.o
 
 subdir-$(CONFIG_PCMCIA)		+= pcmcia
 
@@ -129,8 +129,11 @@
 obj-$(CONFIG_CHR_DEV_SG)	+= sg.o
 
 scsi_mod-objs	:= scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \
-			scsi_proc.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
+
+ifdef CONFIG_PROC_FS
+scsi_mod-objs	+= scsi_proc.o
+endif
 			
 sd_mod-objs	:= sd.o
 sr_mod-objs	:= sr.o sr_ioctl.o sr_vendor.o

--- ChangeLog DELETED ---

--- ChangeLog.ips DELETED ---

--- ChangeLog.ncr53c8xx DELETED ---

--- ChangeLog.serverraid DELETED ---

--- ChangeLog.sym53c8xx DELETED ---

--- LICENSE.FlashPoint DELETED ---

--- README.53c700 DELETED ---

--- README.AM53C974 DELETED ---

--- README.BusLogic DELETED ---

--- README.FlashPoint DELETED ---

--- README.Mylex DELETED ---

--- README.aha152x DELETED ---

--- README.aic7xxx DELETED ---

--- README.dpti DELETED ---

--- README.dtc3x80 DELETED ---

--- README.g_NCR5380 DELETED ---

--- README.ibmmca DELETED ---

--- README.in2000 DELETED ---

--- README.ncr53c7xx DELETED ---

--- README.ncr53c8xx DELETED ---

--- README.osst DELETED ---

--- README.ppa DELETED ---

--- README.qlogicfas DELETED ---

--- README.qlogicisp DELETED ---

--- README.st DELETED ---

--- README.tmscsim DELETED ---

--- cpqfc.Readme DELETED ---

--- scsi_mid_low_api.txt DELETED ---

[LV-commit] CVS: kernel-2.5/drivers/scsi/sym53c8xx_2 ChangeLog.txt,1.1.1.2,NONE Documentation.txt,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi/sym53c8xx_2
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/drivers/scsi/sym53c8xx_2

Removed Files:
	ChangeLog.txt Documentation.txt 
Log Message:
Merge with 2.5.48


--- ChangeLog.txt DELETED ---

--- Documentation.txt DELETED ---

[LV-commit] CVS: kernel-2.5/drivers/scsi/aic7xxx_old README.aic7xxx,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi/aic7xxx_old
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/drivers/scsi/aic7xxx_old

Removed Files:
	README.aic7xxx 
Log Message:
Merge with 2.5.48


--- README.aic7xxx DELETED ---

[LV-commit] CVS: kernel-2.5/drivers/char tty_io.c,1.12,1.13

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/drivers/char

Modified Files:
	tty_io.c 
Log Message:
Merge with 2.5.48


Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tty_io.c	15 Jun 2003 23:29:22 -0000	1.12
+++ tty_io.c	19 Jun 2003 23:31:47 -0000	1.13
@@ -2050,14 +2050,7 @@
 
 void tty_unregister_devfs (struct tty_driver *driver, unsigned minor)
 {
-#ifdef CONFIG_DEVFS_FS
-	int idx = minor - driver->minor_start;
-	char buf[32];
-
-	sprintf(buf, driver->name, idx + driver->name_base);
-	devfs_find_and_unregister(NULL, buf, driver->major, minor,
-				  DEVFS_SPECIAL_CHR, 0);
-#endif /* CONFIG_DEVFS_FS */
+	devfs_remove(driver->name, minor-driver->minor_start+driver->name_base);
 }
 
 EXPORT_SYMBOL(tty_register_devfs);

[LV-commit] CVS: kernel-2.5/Documentation README.nsp_cs.eng,1.1.1.1,NONE scsi-generic.txt,1.1.1.3,NONE scsi.txt,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/Documentation
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/Documentation

Removed Files:
	README.nsp_cs.eng scsi-generic.txt scsi.txt 
Log Message:
Merge with 2.5.48


--- README.nsp_cs.eng DELETED ---

--- scsi-generic.txt DELETED ---

--- scsi.txt DELETED ---

[LV-commit] CVS: kernel-2.5/arch/sparc64/mm modutil.c,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/sparc64/mm
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/arch/sparc64/mm

Removed Files:
	modutil.c 
Log Message:
Merge with 2.5.48


--- modutil.c DELETED ---

[LV-commit] CVS: kernel-2.5/Documentation/vax assembler.txt,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/Documentation/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv22378/Documentation/vax

Modified Files:
	assembler.txt 
Log Message:
Document new assembler syntax


Index: assembler.txt
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Documentation/vax/assembler.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- assembler.txt	20 May 2002 00:33:29 -0000	1.3
+++ assembler.txt	18 Jun 2003 23:02:48 -0000	1.4
@@ -1,24 +1,33 @@
 
-The GNU assembler in Andy's cross compilation tool set is a little
+The GNU assembler in our cross compilation tool set is a little
 different from DEC's MACRO32 assembler.  This file summarises the
 differences.
 
+1. Register names are prefixed with %
 
-1. #, ^ and @ become $, ` and *
+   In VAX MACRO you might write:
+
+      movl #0, r0
+
+   In gas, these are written:
+
+      movl $0, %r0
+
+2. #, ^ and @ become $, ` and *
 
    In VAX MACRO you might write:
 
-      movl #0, 8(r5)
+      movl #0, r0
       movl #0, @8(r5)
       movl #0, L^8(r5)
 
    In gas, these are written:
 
-      movl $0, r0
-      movl $0, *8(r5)
-      movl $0, L`8(r5)
+      movl $0, %r0
+      movl $0, *8(%r5)
+      movl $0, L`8(%r5)
 
-2. ^X becomes 0x
+3. ^X becomes 0x
 
    Hex constants are prefixed with 0x, rather than ^x
    Similarly, a leading zero not followed by an x implies octal.
@@ -32,7 +41,7 @@
 
    gas:
 
-      movl $64, r0
-      movl $0x40, r0
-      movl $0100, r0
+      movl $64, %r0
+      movl $0x40, %r0
+      movl $0100, %r0
 

[LV-commit] CVS: kernel-2.5/arch/vax Makefile,1.21,1.22

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv21755/arch/vax

Modified Files:
	Makefile 
Log Message:
Define LDFLAGS_BLOB which is used in usr/Makefile to wrap up the ramdisk
image into an object file


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile	15 Jun 2003 22:33:55 -0000	1.21
+++ Makefile	18 Jun 2003 22:58:01 -0000	1.22
@@ -12,8 +12,9 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-#LDFLAGS=-m elf_vax
-OBJCOPYFLAGS=-O binary -R .note -R .comment -S
+OBJCOPYFLAGS := -O binary -R .note -R .comment -S
+
+LDFLAGS_BLOB := --format binary --oformat elf32-vax
 
 
 # Note that this CFLAGS definition will override the definition

[LV-commit] CVS: kernel-2.5/fs/ext3 acl.c,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs/ext3
In directory sc8-pr-cvs1:/tmp/cvs-serv25881/fs/ext3

Modified Files:
	acl.c 
Log Message:
Merge with 2.5.47


Index: acl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/ext3/acl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- acl.c	11 May 2003 20:24:55 -0000	1.3
+++ acl.c	15 Jun 2003 23:32:21 -0000	1.4
@@ -547,17 +547,17 @@
 }
 
 struct ext3_xattr_handler ext3_xattr_acl_access_handler = {
-	prefix:	XATTR_NAME_ACL_ACCESS,
-	list:	ext3_xattr_list_acl_access,
-	get:	ext3_xattr_get_acl_access,
-	set:	ext3_xattr_set_acl_access,
+	.prefix	= XATTR_NAME_ACL_ACCESS,
+	.list	= ext3_xattr_list_acl_access,
+	.get	= ext3_xattr_get_acl_access,
+	.set	= ext3_xattr_set_acl_access,
 };
 
 struct ext3_xattr_handler ext3_xattr_acl_default_handler = {
-	prefix:	XATTR_NAME_ACL_DEFAULT,
-	list:	ext3_xattr_list_acl_default,
-	get:	ext3_xattr_get_acl_default,
-	set:	ext3_xattr_set_acl_default,
+	.prefix	= XATTR_NAME_ACL_DEFAULT,
+	.list	= ext3_xattr_list_acl_default,
+	.get	= ext3_xattr_get_acl_default,
+	.set	= ext3_xattr_set_acl_default,
 };
 
 void

[LV-commit] CVS: kernel-2.5/include/linux elf.h,1.4,1.5 nfs_flushd.h,1.1.1.1,NONE nfsiod.h,1.1.1.1,NONE rpcsock.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv25701/include/linux

Modified Files:
	elf.h 
Removed Files:
	nfs_flushd.h nfsiod.h rpcsock.h 
Log Message:
Merge with 2.5.47


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- elf.h	11 May 2003 20:28:23 -0000	1.4
+++ elf.h	15 Jun 2003 23:31:28 -0000	1.5
@@ -1,6 +1,7 @@
 #ifndef _LINUX_ELF_H
 #define _LINUX_ELF_H
 
+#include <linux/sched.h>
 #include <linux/types.h>
 #include <asm/elf.h>
 
@@ -580,7 +581,8 @@
 #define NT_PRFPREG	2
 #define NT_PRPSINFO	3
 #define NT_TASKSTRUCT	4
-#define NT_PRFPXREG	20
+#define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
+
 
 /* Note header in a PT_NOTE section */
 typedef struct elf32_note {

--- nfs_flushd.h DELETED ---

--- nfsiod.h DELETED ---

--- rpcsock.h DELETED ---

[LV-commit] CVS: kernel-2.5/usr Makefile,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/usr
In directory sc8-pr-cvs1:/tmp/cvs-serv25511/usr

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.47


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/usr/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	18 May 2003 18:25:23 -0000	1.2
+++ Makefile	15 Jun 2003 23:30:16 -0000	1.3
@@ -1,18 +1,16 @@
 
-include arch/$(ARCH)/Makefile
-
-#obj-y := initramfs_data.o
+obj-y := initramfs_data.o
 
 host-progs := gen_init_cpio
 
 clean-files := initramfs_data.cpio.gz
 
-$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz
-	$(OBJCOPY) $(ARCHBLOBLFLAGS) \
-		--rename-section .data=.init.initramfs \
-		$(obj)/initramfs_data.cpio.gz $(obj)/initramfs_data.o
-	$(STRIP) -s $(obj)/initramfs_data.o
+LDFLAGS_initramfs_data.o := $(LDFLAGS_BLOB) -r -T
+
+$(obj)/initramfs_data.o: $(src)/initramfs_data.scr $(obj)/initramfs_data.cpio.gz FORCE
+	$(call if_changed,ld)
 
 $(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio
-	( cd $(obj) ; ./gen_init_cpio | gzip -9c > initramfs_data.cpio.gz )
+	./$< | gzip -9c > $@
+
 

[LV-commit] CVS: kernel-2.5/drivers/net Makefile,1.18,1.19

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv25264/drivers/net

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.47


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile	11 May 2003 20:28:22 -0000	1.18
+++ Makefile	15 Jun 2003 23:29:22 -0000	1.19
@@ -101,6 +101,7 @@
 obj-$(CONFIG_LNE390) += lne390.o 8390.o
 obj-$(CONFIG_NE3210) += ne3210.o 8390.o
 obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
+obj-$(CONFIG_B44) += b44.o
 
 obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o

[LV-commit] CVS: kernel-2.5/drivers/char dz.c,1.8,1.9 tty_io.c,1.11,1.12

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv25264/drivers/char

Modified Files:
	dz.c tty_io.c 
Log Message:
Merge with 2.5.47


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dz.c	22 Mar 2003 19:49:41 -0000	1.8
+++ dz.c	15 Jun 2003 23:29:22 -0000	1.9
@@ -1718,12 +1718,12 @@
 }
 
 static struct console dz_sercons = {
-    name:	"ttyS",
-    write:	dz_console_print,
-    device:	dz_console_device,
-    setup:	dz_console_setup,
-    flags:	CON_CONSDEV | CON_PRINTBUFFER,
-    index:	CONSOLE_LINE,
+    .name	= "ttyS",
+    .write	= dz_console_print,
+    .device	= dz_console_device,
+    .setup	= dz_console_setup,
+    .flags	= CON_CONSDEV | CON_PRINTBUFFER,
+    .index	= CONSOLE_LINE,
 };
 
 void __init dz_serial_console_init(void)

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tty_io.c	24 Mar 2003 23:47:43 -0000	1.11
+++ tty_io.c	15 Jun 2003 23:29:22 -0000	1.12
@@ -404,23 +404,23 @@
 }
 
 static struct file_operations tty_fops = {
-	llseek:		no_llseek,
-	read:		tty_read,
-	write:		tty_write,
-	poll:		tty_poll,
-	ioctl:		tty_ioctl,
-	open:		tty_open,
-	release:	tty_release,
-	fasync:		tty_fasync,
+	.llseek		= no_llseek,
+	.read		= tty_read,
+	.write		= tty_write,
+	.poll		= tty_poll,
+	.ioctl		= tty_ioctl,
+	.open		= tty_open,
+	.release	= tty_release,
+	.fasync		= tty_fasync,
 };
 
 static struct file_operations hung_up_tty_fops = {
-	llseek:		no_llseek,
-	read:		hung_up_tty_read,
-	write:		hung_up_tty_write,
-	poll:		hung_up_tty_poll,
-	ioctl:		hung_up_tty_ioctl,
-	release:	tty_release,
+	.llseek		= no_llseek,
+	.read		= hung_up_tty_read,
+	.write		= hung_up_tty_write,
+	.poll		= hung_up_tty_poll,
+	.ioctl		= hung_up_tty_ioctl,
+	.release	= tty_release,
 };
 
 /*

[LV-commit] CVS: kernel-2.5 Makefile,1.54,1.55

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv25087

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.47


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile	11 May 2003 20:28:20 -0000	1.54
+++ Makefile	15 Jun 2003 23:28:13 -0000	1.55
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 46
+SUBLEVEL = 47
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -175,7 +175,7 @@
 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
+	HOSTCXX HOSTCXXFLAGS LDFLAGS_BLOB
 
 export CPPFLAGS NOSTDINC_FLAGS OBJCOPYFLAGS LDFLAGS
 export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE 
@@ -252,7 +252,7 @@
 
 #	In this section, we need .config
 
--include ..config.cmd
+-include .config.cmd
 
 ifdef CONFIG_MODULES
 export EXPORT_FLAGS := -DEXPORT_SYMTAB

[LV-commit] CVS: kernel-2.5/fs/nfs flushd.c,1.1.1.4,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs/nfs
In directory sc8-pr-cvs1:/tmp/cvs-serv24702/fs/nfs

Removed Files:
	flushd.c 
Log Message:
Merge with 2.5.47


--- flushd.c DELETED ---

[LV-commit] CVS: kernel-2.5/drivers/net/pcmcia ax8390.h,1.1.1.2,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/net/pcmcia
In directory sc8-pr-cvs1:/tmp/cvs-serv24702/drivers/net/pcmcia

Removed Files:
	ax8390.h 
Log Message:
Merge with 2.5.47


--- ax8390.h DELETED ---

[LV-commit] CVS: kernel-2.5/drivers/scsi NCR53c406a.h,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv24702/drivers/scsi

Removed Files:
	NCR53c406a.h 
Log Message:
Merge with 2.5.47


--- NCR53c406a.h DELETED ---

[LV-commit] CVS: kernel-2.5/drivers/macintosh mac_keyb.c,1.1.1.3,NONE mackeymap.map,1.1.1.1,NONE rtc.c,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/macintosh
In directory sc8-pr-cvs1:/tmp/cvs-serv24702/drivers/macintosh

Removed Files:
	mac_keyb.c mackeymap.map rtc.c 
Log Message:
Merge with 2.5.47


--- mac_keyb.c DELETED ---

--- mackeymap.map DELETED ---

--- rtc.c DELETED ---

[LV-commit] CVS: kernel-2.5/arch/ppc/platforms cpc700.h,1.1.1.2,NONE cpc700_pic.c,1.1.1.2,NONE cpc710.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/ppc/platforms
In directory sc8-pr-cvs1:/tmp/cvs-serv24338/arch/ppc/platforms

Removed Files:
	cpc700.h cpc700_pic.c cpc710.h 
Log Message:
Merge with 2.5.47


--- cpc700.h DELETED ---

--- cpc700_pic.c DELETED ---

--- cpc710.h DELETED ---

[LV-commit] CVS: kernel-2.5/scripts Configure,1.1.1.6,NONE Menuconfig,1.1.1.4,NONE tail.tk,1.1.1.1,NONE tkcond.c,1.1.1.1,NONE tkgen.c,1.1.1.2,NONE tkparse.c,1.1.1.3,NONE tkparse.h,1.1.1.2,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv24338/scripts

Removed Files:
	Configure Menuconfig tail.tk tkcond.c tkgen.c tkparse.c 
	tkparse.h 
Log Message:
Merge with 2.5.47


--- Configure DELETED ---

--- Menuconfig DELETED ---

--- tail.tk DELETED ---

--- tkcond.c DELETED ---

--- tkgen.c DELETED ---

--- tkparse.c DELETED ---

--- tkparse.h DELETED ---

[LV-commit] CVS: kernel-2.5/arch/ppc/kernel btext.c,1.1.1.4,NONE gt64260_common.c,1.1.1.1,NONE gt64260_pic.c,1.1.1.1,NONE harrier.c,1.1.1.1,NONE i8259.c,1.1.1.7,NONE indirect_pci.c,1.1.1.5,NONE m8260_setup.c,1.1.1.4,NONE m8xx_setup.c,1.1.1.6,NONE mpc10x_common.c,1.1.1.1,NONE open_pic.c,1.1.1.10,NONE open_pic_defs.h,1.1.1.3,NONE pci_auto.c,1.1.1.1,NONE ppc405_dma.c,1.1.1.1,NONE ppc405_pci.c,1.1.1.1,NONE ppc4xx_kgdb.c,1.1.1.1,NONE ppc4xx_pic.c,1.1.1.4,NONE ppc4xx_pm.c,1.1.1.1,NONE ppc4xx_serial.c,1.1.1.2,NONE ppc4xx_setup.c,1.1.1.7,NONE ppc8260_pic.c,1.1.1.4,NONE ppc8260_pic.h,1.1.1.3,NONE ppc8xx_pic.c,1.1.1.4,NONE ppc8xx_pic.h,1.1.1.3,NONE pplus_common.c,1.1.1.1,NONE prep_nvram.c,1.1.1.3,NONE prom.c,1.1.1.6,NONE prom_init.c,1.1.1.3,NONE qspan_pci.c,1.1.1.4,NONE todc_time.c,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/ppc/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv24338/arch/ppc/kernel

Removed Files:
	btext.c gt64260_common.c gt64260_pic.c harrier.c i8259.c 
	indirect_pci.c m8260_setup.c m8xx_setup.c mpc10x_common.c 
	open_pic.c open_pic_defs.h pci_auto.c ppc405_dma.c 
	ppc405_pci.c ppc4xx_kgdb.c ppc4xx_pic.c ppc4xx_pm.c 
	ppc4xx_serial.c ppc4xx_setup.c ppc8260_pic.c ppc8260_pic.h 
	ppc8xx_pic.c ppc8xx_pic.h pplus_common.c prep_nvram.c prom.c 
	prom_init.c qspan_pci.c todc_time.c 
Log Message:
Merge with 2.5.47


--- btext.c DELETED ---

--- gt64260_common.c DELETED ---

--- gt64260_pic.c DELETED ---

--- harrier.c DELETED ---

--- i8259.c DELETED ---

--- indirect_pci.c DELETED ---

--- m8260_setup.c DELETED ---

--- m8xx_setup.c DELETED ---

--- mpc10x_common.c DELETED ---

--- open_pic.c DELETED ---

--- open_pic_defs.h DELETED ---

--- pci_auto.c DELETED ---

--- ppc405_dma.c DELETED ---

--- ppc405_pci.c DELETED ---

--- ppc4xx_kgdb.c DELETED ---

--- ppc4xx_pic.c DELETED ---

--- ppc4xx_pm.c DELETED ---

--- ppc4xx_serial.c DELETED ---

--- ppc4xx_setup.c DELETED ---

--- ppc8260_pic.c DELETED ---

--- ppc8260_pic.h DELETED ---

--- ppc8xx_pic.c DELETED ---

--- ppc8xx_pic.h DELETED ---

--- pplus_common.c DELETED ---

--- prep_nvram.c DELETED ---

--- prom.c DELETED ---

--- prom_init.c DELETED ---

--- qspan_pci.c DELETED ---

--- todc_time.c DELETED ---