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

[LV-commit] FASD project: Online survey launched

[<ben...@id...>]

Dear Open Source developer

I am doing a research project on "Fun and Software Development" in which I kindly invite you to participate.
You will find the online survey under http://fasd.ethz.ch/qsf/. The questionnaire consists of 53 questions and you will need about 15 minutes to complete it.

With the FASD project (Fun and Software Development) we want to define the motivational significance of fun when software developers decide to engage in Open Source projects. What is special about our research project is that a similar survey is planned with software developers in commercial firms. This procedure allows the immediate comparison between the involved individuals and the conditions of production of these two development models. Thus we hope to obtain substantial new insights to the phenomenon of Open Source Development.


With many thanks for your participation,
Benno Luthiger


PS:
The results of the survey will be published under http://www.isu.unizh.ch/fuehrung/blprojects/FASD/.
We have set up the mailing list fa...@we... for this study. Please see http://fasd.ethz.ch/qsf/mailinglist_en.html for registration to this mailing list.

_______________________________________________________________________

Benno Luthiger
Swiss Federal Institute of Technology Zurich
8092 Zurich

Mail: benno.luthiger(at)id.ethz.ch
_______________________________________________________________________

[LV-commit] kernel-2.4/arch/vax/kernel signal.c,1.11,1.12

[<ai...@us...>]

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

Modified Files:
	signal.c 
Log Message:
DA: this is better than what was there already - still not tested,
I'd say there is still some work left to do


Index: signal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/signal.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- signal.c	16 Feb 2003 23:28:02 -0000	1.11
+++ signal.c	16 Sep 2003 12:34:15 -0000	1.12
@@ -32,7 +32,7 @@
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 
-#undef DEBUG_SIG
+#undef DEBUG_SIG 
 
 /* FIXME: Check this & fixup other regs, like r0 */
 #define RESTART_VAX_SYSCALL(regs) { (regs)->pc -= 4; } 
@@ -188,12 +188,10 @@
 
 /* FIXME: this dont work ... */
 struct rt_sigframe {
-   	char *pretcode;
-	struct siginfo *pinfo;
-	void *puc;
+	int sig;
 	struct siginfo info;
 	struct ucontext uc;
-	unsigned char retcode[8];  /* trampoline code */
+	unsigned char retcode[20];  /* trampoline code */
 };
 
 
@@ -526,17 +524,14 @@
 			   sigset_t *set, struct pt_regs * regs)
 {
 	struct rt_sigframe *frame;
-	unsigned long return_ip;
 	int err = 0;
 
-   	machine_halt();
+	//   	machine_halt();
 	frame = get_sigframe(ka, regs, sizeof(*frame));
 
 	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
 		goto give_sigsegv;
 
-	err |= __put_user(&frame->info, &frame->pinfo);
-	err |= __put_user(&frame->uc, &frame->puc);
 	err |= copy_siginfo_to_user(&frame->info, info);
 	if (err)
 		goto give_sigsegv;
@@ -553,17 +548,54 @@
 
 	/* Set up to return from userspace.  If provided, use a stub
 	   already in userspace.  */
+
+	/* Set up to return from userspace.  If provided, use a stub
+	   already in userspace.  */
+   
+        /* We do this differently to other ports. Each function has a two byte RSM.
+	 * (due to the calling convention).  Each sighandler will expect to be 
+	 * CALLS'd and will RET from that. So we cant just muck about with PC's on the
+	 * stack like the i386. So we use the trampoline code on the stack a bit more.
+	 * The easiest way to skip around all this is to calls the signal
+	 * handler, and then either calls the restorer, or chmk to sys_sigreturn */
+   
+        /* 	 CALLS $1, */
+        err |= __put_user(0xfb, (char *)(frame->retcode+0));
+        err |= __put_user(0x01, (char *)(frame->retcode+1));
+        /*             (absolute address)*/
+        err |= __put_user(0x9f,   (char  *)(frame->retcode+2));
+        /*				     sighandler */
+        err |= __put_user(((unsigned long) ka->sa.sa_handler), (unsigned long *)(frame->retcode + 3));
+        
 	if (ka->sa.sa_flags & SA_RESTORER) {
-		return_ip = (unsigned long)ka->sa.sa_restorer;
+	        /*  CALLS $0,*/
+                err |= __put_user(0xfb, (char *)(frame->retcode+7));
+                err |= __put_user(0x00, (char *)(frame->retcode+8));
+                /*             (absolute address)*/
+                err |= __put_user(0x9f,   (char  *)(frame->retcode+9));
+                /*				     restorer */
+                err |= __put_user(((unsigned long) ka->sa.sa_restorer), (unsigned long *)(frame->retcode + 10));
+		/* plus a halt */
+	        err |= __put_user(0x00,   (char *)(frame->retcode+14));
 	} else {
-		/* trampoline - the desired return ip is the retcode itself */
-		return_ip = (unsigned long)&frame->retcode;
-		/* TODO: check byteorder */
-		err |= __put_user(0xbc8f,         (short *)(frame->retcode+0));
-		err |= __put_user(__NR_sigreturn, (short *)(frame->retcode+2));
+	        /* perform a syscall to sys_sigreturn. First set up the 
+		 * argument list to avoid confusing it */
+	   
+		/* pushl $0x0 */	   
+		err |= __put_user(0xdd,         (char *)(frame->retcode+7));
+		err |= __put_user(0x00,         (char *)(frame->retcode+8));
+	        /* movl sp, ap */
+		err |= __put_user(0xd0,         (char *)(frame->retcode+9));
+		err |= __put_user(0x5e,         (char *)(frame->retcode+10));
+		err |= __put_user(0x5c,         (char *)(frame->retcode+11));
+		/* chmk __NR_sigreturn; */
+		err |= __put_user(0xbc,         (char *)(frame->retcode+12));
+		err |= __put_user(0x8f,         (char *)(frame->retcode+13));
+		err |= __put_user(__NR_sigreturn, (short *)(frame->retcode+14));
+		/* plus a halt */
+	        err |= __put_user(0x00,   (char *)(frame->retcode+16));
 	}
 
-        err |= __put_user(return_ip, &frame->pretcode);
 	if (err)
 		goto give_sigsegv;
 
@@ -572,7 +604,9 @@
 	/* Set up registers for signal handler */
 
 	regs->pc = (unsigned long) ka->sa.sa_handler;  /* what we enter NOW   */
-	regs->sp = (unsigned int)frame;                          /* what we enter LATER */
+	regs->fp = regs->sp;
+	regs->sp = (unsigned int)frame;                /* what we enter LATER */
+	__mtpr(frame, PR_USP);
 
 	return;
 
@@ -657,7 +691,7 @@
 		return 1;
 
         /* FIXME: */
-   	canrestart=0;
+   	canrestart=regs->r0;
 #ifdef DEBUG_SIG   
 	printk("do_signal: pid %d,canrestart %d, current->sigpending %d,current->blocked %d ", current->pid,canrestart,current->sigpending,current->blocked);
 #endif    

[LV-commit] kernel-2.5/include/asm-vax thread_info.h,1.3,1.4

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

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

Modified Files:
	thread_info.h 
Log Message:
alloc_thread_info() takes a task argument in 2.5.71


Index: thread_info.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/thread_info.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thread_info.h	9 Jul 2003 23:10:17 -0000	1.3
+++ thread_info.h	10 Sep 2003 08:59:41 -0000	1.4
@@ -79,7 +79,7 @@
 
 /* thread information allocation */
 #define THREAD_SIZE (2*PAGE_SIZE)
-#define alloc_thread_info() ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
+#define alloc_thread_info(task) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
 #define free_thread_info(ti) free_pages((unsigned long) (ti), 1)
 #define get_thread_info(ti) get_task_struct((ti)->task)
 #define put_thread_info(ti) put_task_struct((ti)->task)

[LV-commit] kernel-2.5/include/asm-vax bug.h,1.1,1.2

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

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

Modified Files:
	bug.h 
Log Message:
Define BUG_ON and WARN_ON


Index: bug.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bug.h	3 Aug 2003 12:45:07 -0000	1.1
+++ bug.h	10 Sep 2003 08:58:59 -0000	1.2
@@ -6,6 +6,15 @@
         __asm__ __volatile__("bugw $0"); \
 } while (0)
 
+#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
+
+#define WARN_ON(condition) do { \
+	if (unlikely((condition)!=0)) { \
+		printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
+		dump_stack(); \
+	} \
+} while (0)
+
 #define PAGE_BUG(page) do { \
         BUG(); \
 } while (0)

[LV-commit] kernel-2.5/drivers/char dz.c,1.13,1.14 dz.h,1.5,1.6

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

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

Modified Files:
	dz.c dz.h 
Log Message:
Callout serial devices (cua*) disappear completely in 2.5.71.


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dz.c	28 Aug 2003 22:36:36 -0000	1.13
+++ dz.c	10 Sep 2003 08:58:11 -0000	1.14
@@ -1121,14 +1121,6 @@
 	}
 	info->flags |= DZ_CLOSING;
 	/*
-	 * Save the termios structure, since this port may have
-	 * separate termios for callout and dialin.
-	 */
-	if (info->flags & DZ_NORMAL_ACTIVE)
-		info->normal_termios = *tty->termios;
-	if (info->flags & DZ_CALLOUT_ACTIVE)
-		info->callout_termios = *tty->termios;
-	/*
 	 * Now we wait for the transmit buffer to clear; and we notify the line
 	 * discipline to only process XON/XOFF characters.
 	 */
@@ -1167,7 +1159,7 @@
 		wake_up_interruptible(&info->open_wait);
 	}
 
-	info->flags &= ~(DZ_NORMAL_ACTIVE | DZ_CALLOUT_ACTIVE | DZ_CLOSING);
+	info->flags &= ~(DZ_NORMAL_ACTIVE | DZ_CLOSING);
 	wake_up_interruptible(&info->close_wait);
 
 	restore_flags(flags);
@@ -1184,7 +1176,7 @@
 	shutdown(info);
 	info->event = 0;
 	info->count = 0;
-	info->flags &= ~(DZ_NORMAL_ACTIVE | DZ_CALLOUT_ACTIVE);
+	info->flags &= ~DZ_NORMAL_ACTIVE;
 	info->tty = 0;
 	wake_up_interruptible(&info->open_wait);
 }
@@ -1211,47 +1203,18 @@
 	}
 
 	/*
-	 * If this is a callout device, then just make sure the normal
-	 * device isn't being used.
-	 */
-	if (tty->driver->subtype == SERIAL_TYPE_CALLOUT) {
-		if (info->flags & DZ_NORMAL_ACTIVE)
-			return -EBUSY;
-    
-		if ((info->flags & DZ_CALLOUT_ACTIVE) &&
-		    (info->flags & DZ_SESSION_LOCKOUT) &&
-		    (info->session != current->session))
-			return -EBUSY;
-    
-		if ((info->flags & DZ_CALLOUT_ACTIVE) &&
-		    (info->flags & DZ_PGRP_LOCKOUT) &&
-		    (info->pgrp != current->pgrp))
-			return -EBUSY;
-
-		info->flags |= DZ_CALLOUT_ACTIVE;
-		return 0;
-	}
-
-	/*
 	 * If non-blocking mode is set, or the port is not enabled, then make
 	 * the check up front and then exit.
 	 */
 	if ((filp->f_flags & O_NONBLOCK) ||
 	    (tty->flags & (1 << TTY_IO_ERROR))) {
-		if (info->flags & DZ_CALLOUT_ACTIVE)
-			return -EBUSY;
 		info->flags |= DZ_NORMAL_ACTIVE;
 
 		return 0;
 	}
 
-	if (info->flags & DZ_CALLOUT_ACTIVE) {
-		if (info->normal_termios.c_cflag & CLOCAL)
-			do_clocal = 1;
-	} else {
-		if (tty->termios->c_cflag & CLOCAL)
+	if (tty->termios->c_cflag & CLOCAL)
 		do_clocal = 1;
-	}
 
 	/*
 	 * Block waiting for the carrier detect and the line to become free
@@ -1270,8 +1233,7 @@
 			retval = -EAGAIN;
 			break;
 		}
-		if (!(info->flags & DZ_CALLOUT_ACTIVE) &&
-		    !(info->flags & DZ_CLOSING) && do_clocal)
+		if (!(info->flags & DZ_CLOSING) && do_clocal)
 			break;
 		if (signal_pending(current)) {
 			retval = -ERESTARTSYS;
@@ -1331,17 +1293,6 @@
 	if (retval)
 		return retval;
 
-	if ((info->count == 1) && (info->flags & DZ_SPLIT_TERMIOS)) {
-		if (tty->driver->subtype == SERIAL_TYPE_NORMAL)
-			*tty->termios = info->normal_termios;
-		else 
-			*tty->termios = info->callout_termios;
-		change_speed(info);
-	}
-
-	info->session = current->session;
-	info->pgrp = current->pgrp;
-
 	return 0;
 }
 
@@ -1350,6 +1301,25 @@
 	printk("%s%s\n", dz_name, dz_version);
 }
 
+static struct tty_driver *serial_driver;
+
+static struct tty_operations serial_ops = {
+	.open = dz_open,
+	.close = dz_close,
+	.write = dz_write,
+	.flush_chars = dz_flush_chars,
+	.write_room = dz_write_room,
+	.chars_in_buffer = dz_chars_in_buffer,
+	.flush_buffer = dz_flush_buffer,
+	.ioctl = dz_ioctl,
+	.throttle = dz_throttle,
+	.unthrottle = dz_unthrottle,
+	.send_xchar = dz_send_xchar,
+	.set_termios = dz_set_termios,
+	.stop = dz_stop,
+	.start = dz_start,
+	.hangup = dz_hangup,
+};
 
 int __init dz_init(void)
 {
@@ -1358,68 +1328,28 @@
 #ifdef CONFIG_VAX
         int irq;
 #endif   
-	show_serial_version();
 
-	memset(&serial_driver, 0, sizeof(struct tty_driver));
-	serial_driver.magic = TTY_DRIVER_MAGIC;
-	serial_driver.owner = THIS_MODULE;
-#ifdef CONFIG_VAX
-	serial_driver.name = "ttyS";
-#else   
-#if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
-	serial_driver.name = "ttyS";
-#else
-	serial_driver.name = "tts/";
-#endif
-#endif /* config_vax */   
-	serial_driver.major = TTY_MAJOR;
-	serial_driver.minor_start = 64;
-	serial_driver.num = DZ_NB_PORT;
-	serial_driver.type = TTY_DRIVER_TYPE_SERIAL;
-	serial_driver.subtype = SERIAL_TYPE_NORMAL;
-	serial_driver.init_termios = tty_std_termios;
-
-	serial_driver.init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |
-	                                     CLOCAL;
-	serial_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
-	serial_driver.refcount = &serial_refcount;
-	serial_driver.table = serial_table;
-	serial_driver.termios = serial_termios;
-	serial_driver.termios_locked = serial_termios_locked;
+	serial_driver = alloc_tty_driver(DZ_NB_PORT);
+	if (!serial_driver)
+		return -ENOMEM;
 
-	serial_driver.open = dz_open;
-	serial_driver.close = dz_close;
-	serial_driver.write = dz_write;
-	serial_driver.flush_chars = dz_flush_chars;
-	serial_driver.write_room = dz_write_room;
-	serial_driver.chars_in_buffer = dz_chars_in_buffer;
-	serial_driver.flush_buffer = dz_flush_buffer;
-	serial_driver.ioctl = dz_ioctl;
-	serial_driver.throttle = dz_throttle;
-	serial_driver.unthrottle = dz_unthrottle;
-	serial_driver.send_xchar = dz_send_xchar;
-	serial_driver.set_termios = dz_set_termios;
-	serial_driver.stop = dz_stop;
-	serial_driver.start = dz_start;
-	serial_driver.hangup = dz_hangup;
+	show_serial_version();
 
-	/*
-	 * The callout device is just like normal device except for major
-	 * number and the subtype code.
-	 */
-	callout_driver = serial_driver;
-#if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
-	callout_driver.name = "cua";
-#else
-	callout_driver.name = "cua/";
-#endif
-	callout_driver.major = TTYAUX_MAJOR;
-	callout_driver.subtype = SERIAL_TYPE_CALLOUT;
+	serial_driver->owner = THIS_MODULE;
+	serial_driver->devfs_name = "tts/";
+	serial_driver->name = "ttyS";
+	serial_driver->major = TTY_MAJOR;
+	serial_driver->minor_start = 64;
+	serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
+	serial_driver->subtype = SERIAL_TYPE_NORMAL;
+	serial_driver->init_termios = tty_std_termios;
+	serial_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |
+	                                     CLOCAL;
+	serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+	tty_set_operations(serial_driver, &serial_ops);
 
-	if (tty_register_driver (&serial_driver))
+	if (tty_register_driver(serial_driver))
 		panic("Couldn't register serial driver\n");
-	if (tty_register_driver (&callout_driver))
-		panic("Couldn't register callout driver\n");
 
 	save_flags(flags); cli();
 	for (i=0; i < DZ_NB_PORT;  i++) {
@@ -1446,8 +1376,6 @@
 		info->blocked_open = 0;
 		INIT_WORK(&info->tqueue, do_softint, info);
 		INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info);
-		info->callout_termios = callout_driver.init_termios;
-		info->normal_termios = serial_driver.init_termios;
 		init_waitqueue_head(&info->open_wait); 
 		init_waitqueue_head(&info->close_wait); 
 
@@ -1465,8 +1393,7 @@
 		       info->port, SERIAL);
 #endif
 
-		tty_register_device(&serial_driver, info->line, NULL);
-		tty_register_device(&callout_driver, info->line, NULL);
+		tty_register_device(serial_driver, info->line, NULL);
 	}
 
 	/* Reset the chip */
@@ -1618,7 +1545,7 @@
 static struct tty_driver *dz_console_device(struct console *c, int *index)
 {
 	*index = c->index;
-	return &serial_driver;
+	return serial_driver;
 }
 
 static int __init dz_console_setup(struct console *co, char *options)

Index: dz.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dz.h	28 Aug 2003 21:38:02 -0000	1.5
+++ dz.h	10 Sep 2003 08:58:11 -0000	1.6
@@ -168,29 +168,17 @@
 
   struct async_icount     icount;              /* keep track of things ... */
   struct tty_struct       *tty;                /* tty associated */
-  struct work_struct      tqueue;
-  struct work_struct      tqueue_hangup;       /* Seems to be no longer used */
-  struct termios          normal_termios;
-  struct termios          callout_termios;
+  struct work_struct      tqueue;              /* Queue for BH */
+  struct work_struct      tqueue_hangup;
   wait_queue_head_t       open_wait;
   wait_queue_head_t       close_wait;
 
-  long                    session;             /* Session of opening process */
-  long                    pgrp;                /* pgrp of opening process */
-
   unsigned char           is_console;          /* flag indicating a serial console */
   unsigned char           is_initialized;
 };
 
 static struct dz_serial multi[DZ_NB_PORT];    /* Four serial lines in the DZ chip */
 static struct dz_serial *dz_console;
-static struct tty_driver serial_driver, callout_driver;
-
-static struct tty_struct *serial_table[DZ_NB_PORT];
-static struct termios *serial_termios[DZ_NB_PORT];
-static struct termios *serial_termios_locked[DZ_NB_PORT];
-
-static int serial_refcount;
 
 #ifdef CONFIG_VAX
 static unsigned char dz_vsbus_rx_int, dz_vsbus_tx_int;

[LV-commit] kernel-2.5/net/core flow.c,1.1.1.2,1.2

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

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

Modified Files:
	flow.c 
Log Message:
include cpu.h to declare register_cpu_notifier().  This fix is coming
in 2.5.72.


Index: flow.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/net/core/flow.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- flow.c	7 Sep 2003 14:35:52 -0000	1.1.1.2
+++ flow.c	10 Sep 2003 08:57:16 -0000	1.2
@@ -18,6 +18,7 @@
 #include <linux/percpu.h>
 #include <linux/bitops.h>
 #include <linux/notifier.h>
+#include <linux/cpu.h>
 #include <net/flow.h>
 #include <asm/atomic.h>
 #include <asm/semaphore.h>

[LV-commit] kernel-2.5/arch/vax/lib Makefile,1.6,1.7

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

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

Modified Files:
	Makefile 
Log Message:
kbuild changes for 2.5.71


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	10 Jul 2003 00:13:16 -0000	1.6
+++ Makefile	10 Sep 2003 08:56:19 -0000	1.7
@@ -1,12 +1,7 @@
 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically 
-# DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
 
-L_TARGET := lib.a
-
-obj-y   := string.o console.o negdi.o checksum.o lshrdi3.o strncpy_user.o \
+lib-y   := string.o console.o negdi.o checksum.o lshrdi3.o strncpy_user.o \
 		copy_tofrom_user.o strnlen_user.o clear_user.o
 

[LV-commit] kernel-2.5/scripts Makefile.build,1.13,1.14

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

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

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


Index: Makefile.build
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.build	28 Aug 2003 22:32:22 -0000	1.13
+++ Makefile.build	7 Sep 2003 15:11:44 -0000	1.14
@@ -32,9 +32,7 @@
 endif
 
 ifdef L_TARGET
-ifneq ($(L_TARGET),lib.a)
-$(warning kbuild: $(obj)/Makefile - L_TARGET := $(L_TARGET) target shall be renamed to lib.a. Please fix!)
-endif
+$(error kbuild: $(obj)/Makefile - Use of L_TARGET is replaced by lib-y in 2.5. Please fix!)
 endif
 
 ifdef list-multi
@@ -47,21 +45,19 @@
 
 # ===========================================================================
 
-# 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
-ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-)),)
-O_TARGET := $(obj)/built-in.o
+ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
+lib-target := $(obj)/lib.a
 endif
+
+ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target)),)
+builtin-target := $(obj)/built-in.o
 endif
 
 # We keep a list of all modules in $(MODVERDIR)
 
 touch-module = @echo $(@:.o=.ko) > $(MODVERDIR)/$(@F:.o=.mod)
 
-__build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(extra-y)) \
+__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
 	 $(if $(KBUILD_MODULES),$(obj-m)) \
 	 $(subdir-ym) $(always)
 	@:
@@ -71,55 +67,7 @@
 quiet_cmd_checksrc = CHECK   $<
       cmd_checksrc = $(CHECK) $(c_flags) $< ;
 endif
- 
-# Module versioning
-# ---------------------------------------------------------------------------
-
-ifdef CONFIG_MODVERSIONS
-
-# $(call if_changed_rule,vcc_o_c) does essentially the same as the
-# normal $(call if_changed_dep,cc_o_c), i.e. compile an object file
-# from a C file, keeping track of the command line and dependencies.
-#
-# However, actually it does:
-# o compile a .tmp_<file>.o from <file>.c
-# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
-#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
-#   are done.
-# o otherwise, we calculate symbol versions using the good old
-#   genksyms on the preprocessed source and postprocess them in a way
-#   that they are usable as a linker script
-# o generate <file>.o from .tmp_<file>.o using the linker to
-#   replace the unresolved symbols __crc_exported_symbol with
-#   the actual value of the checksum generated by genksyms
 
-quiet_cmd_vcc_o_c = CC $(quiet_modtag)  $@
-cmd_vcc_o_c       = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
-
-define rule_vcc_o_c
-	$(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)	      \
-	$(cmd_checksrc)							      \
-	$(if $($(quiet)cmd_vcc_o_c),echo '  $($(quiet)cmd_vcc_o_c)';)	      \
-	$(cmd_vcc_o_c);							      \
-									      \
-	if ! $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	      \
-		mv $(@D)/.tmp_$(@F) $@;					      \
-	else								      \
-		$(CPP) -D__GENKSYMS__ $(c_flags) $<			      \
-		| $(GENKSYMS)						      \
-		> $(@D)/.tmp_$(@F:.o=.ver);				      \
-									      \
-		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		      \
-			-T $(@D)/.tmp_$(@F:.o=.ver);			      \
-		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	      \
-	fi;			
-					      \
-	scripts/fixdep $(depfile) $@ '$(cmd_vcc_o_c)' > $(@D)/.$(@F).tmp;     \
-	rm -f $(depfile);						      \
-	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
-endef
-
-endif
 
 # Compile C sources (.c)
 # ---------------------------------------------------------------------------
@@ -164,38 +112,66 @@
 %.i: %.c FORCE
 	$(call if_changed_dep,cc_i_c)
 
+# C (.c) files
+# The C file is compiled and updated dependency information is generated.
+# (See cmd_cc_o_c + relevant part of rule_cc_o_c)
+
+quiet_cmd_cc_o_c = CC $(quiet_modtag)  $@
+
 # 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_modtag)  $@
-cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $< $(listing_o_c)
+ifndef CONFIG_MODVERSIONS
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< $(listing_o_c)
+
+else
+# When module versioning is enabled the following steps are executed:
+# o compile a .tmp_<file>.o from <file>.c
+# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
+#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
+#   are done.
+# o otherwise, we calculate symbol versions using the good old
+#   genksyms on the preprocessed source and postprocess them in a way
+#   that they are usable as a linker script
+# o generate <file>.o from .tmp_<file>.o using the linker to
+#   replace the unresolved symbols __crc_exported_symbol with
+#   the actual value of the checksum generated by genksyms
+
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
+cmd_modversions =							\
+	if ! $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	\
+		mv $(@D)/.tmp_$(@F) $@;					\
+	else								\
+		$(CPP) -D__GENKSYMS__ $(c_flags) $<			\
+		| $(GENKSYMS)						\
+		> $(@D)/.tmp_$(@F:.o=.ver);				\
+									\
+		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\
+			-T $(@D)/.tmp_$(@F:.o=.ver);			\
+		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	\
+	fi;
+endif
+
 define rule_cc_o_c
-	$(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)	      \
-	$(cmd_checksrc)							      \
-	$(if $($(quiet)cmd_cc_o_c),echo '  $($(quiet)cmd_cc_o_c)';)	      \
-	$(cmd_cc_o_c);							      \
-	scripts/fixdep $(depfile) $@ '$(cmd_cc_o_c)' > $(@D)/.$(@F).tmp;      \
-	rm -f $(depfile);						      \
+	$(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)   \
+	$(cmd_checksrc)							  \
+	$(if $($(quiet)cmd_cc_o_c),echo '  $($(quiet)cmd_cc_o_c)';)	  \
+	$(cmd_cc_o_c);							  \
+	$(cmd_modversions)						  \
+	scripts/fixdep $(depfile) $@ '$(cmd_cc_o_c)' > $(@D)/.$(@F).tmp;  \
+	rm -f $(depfile);						  \
 	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
 endef
 
 # Built-in and composite module parts
 
 %.o: %.c FORCE
-ifdef CONFIG_MODVERSIONS
-	$(call if_changed_rule,vcc_o_c)
-else
 	$(call if_changed_rule,cc_o_c)
-endif
 
 # Single-part modules are special since we need to mark them in $(MODVERDIR)
 
 $(single-used-m): %.o: %.c FORCE
-ifdef CONFIG_MODVERSIONS
-	$(call if_changed_rule,vcc_o_c)
-else
 	$(call if_changed_rule,cc_o_c)
-endif
 	$(touch-module)
 
 quiet_cmd_cc_lst_c = MKLST   $@
@@ -226,7 +202,8 @@
 %.o: %.S FORCE
 	$(call if_changed_dep,as_o_S)
 
-targets += $(real-objs-y) $(real-objs-m) $(extra-y) $(MAKECMDGOALS) $(always)
+targets += $(real-objs-y) $(real-objs-m) $(lib-y)
+targets += $(extra-y) $(MAKECMDGOALS) $(always)
 
 # Build the compiled-in targets
 # ---------------------------------------------------------------------------
@@ -237,30 +214,30 @@
 #
 # Rule to compile a set of .o files into one .o file
 #
-ifdef O_TARGET
+ifdef builtin-target
 quiet_cmd_link_o_target = LD      $@
-# If the list of objects to link is empty, just create an empty O_TARGET
+# If the list of objects to link is empty, just create an empty built-in.o
 cmd_link_o_target = $(if $(strip $(obj-y)),\
 		      $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
 		      rm -f $@; $(AR) rcs $@)
 
-$(O_TARGET): $(obj-y) FORCE
+$(builtin-target): $(obj-y) FORCE
 	$(call if_changed,link_o_target)
 
-targets += $(O_TARGET)
-endif # O_TARGET
+targets += $(builtin-target)
+endif # builtin-target
 
 #
 # Rule to compile a set of .o files into one .a file
 #
-ifdef L_TARGET
+ifdef lib-target
 quiet_cmd_link_l_target = AR      $@
-cmd_link_l_target = rm -f $@; $(AR) $(EXTRA_ARFLAGS) rcs $@ $(obj-y)
+cmd_link_l_target = rm -f $@; $(AR) $(EXTRA_ARFLAGS) rcs $@ $(lib-y)
 
-$(L_TARGET): $(obj-y) FORCE
+$(lib-target): $(lib-y) FORCE
 	$(call if_changed,link_l_target)
 
-targets += $(L_TARGET)
+targets += $(lib-target)
 endif
 
 #

[LV-commit] kernel-2.5/include/sound pcm_sgbuf.h,1.1.1.6,NONE

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

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

Removed Files:
	pcm_sgbuf.h 
Log Message:
Merge with 2.5.71


--- pcm_sgbuf.h DELETED ---

[LV-commit] kernel-2.5/include/pcmcia bus_ops.h,1.1.1.3,NONE driver_ops.h,1.1.1.3,NONE

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

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

Removed Files:
	bus_ops.h driver_ops.h 
Log Message:
Merge with 2.5.71


--- bus_ops.h DELETED ---

--- driver_ops.h DELETED ---

[LV-commit] kernel-2.5/drivers/net ptifddi.c,1.1.1.2,NONE ptifddi.h,1.1.1.1,NONE ptifddi_asm.h,1.1.1.1,NONE setup.c,1.1.1.5,NONE

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

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

Removed Files:
	ptifddi.c ptifddi.h ptifddi_asm.h setup.c 
Log Message:
Merge with 2.5.71


--- ptifddi.c DELETED ---

--- ptifddi.h DELETED ---

--- ptifddi_asm.h DELETED ---

--- setup.c DELETED ---

[LV-commit] kernel-2.5/net/ipv4 ah.c,1.1.1.11,NONE esp.c,1.1.1.11,NONE

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

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

Removed Files:
	ah.c esp.c 
Log Message:
Merge with 2.5.71


--- ah.c DELETED ---

--- esp.c DELETED ---

[LV-commit] kernel-2.5 Makefile,1.78,1.79

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.71


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Makefile	28 Aug 2003 22:30:24 -0000	1.78
+++ Makefile	7 Sep 2003 15:00:49 -0000	1.79
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 70
+SUBLEVEL = 71
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -33,14 +33,39 @@
 # then ARCH is assigned, getting whatever value it gets normally, and 
 # SUBARCH is subsequently ignored.
 
-SUBARCH := vax
-ARCH := $(SUBARCH)
+SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+				  -e s/arm.*/arm/ -e s/sa110/arm/ \
+				  -e s/s390x/s390/ )
 
 # Remove hyphens since they have special meaning in RPM filenames
 KERNELPATH=kernel-$(subst -,,$(KERNELRELEASE))
 
+# Cross compiling and selecting different set of gcc/bin-utils
+# ---------------------------------------------------------------------------
+#
+# When performing cross compilation for other architectures ARCH shall be set
+# to the target architecture. (See arch/* for the possibilities).
+# ARCH can be set during invocation of make:
+# make ARCH=ia64
+# Another way is to have ARCH set in the environment.
+# The default ARCH is the host where make is executed.
+
+# CROSS_COMPILE specify the prefix used for all executables used
+# during compilation. Only gcc and related bin-utils executables
+# are prefixed with $(CROSS_COMPILE).
+# CROSS_COMPILE can be set on the command line
+# make CROSS_COMPILE=ia64-linux-
+# Alternatively CROSS_COMPILE can be set in the environment.
+# Default value for CROSS_COMPILE is not to prefix executables
+# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
+
+ARCH		?= vax
+CROSS_COMPILE	?= vax-dec-linux-
+
+# Architecture as present in compile.h
 UTS_MACHINE := $(ARCH)
 
+# SHELL used by kbuild
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 	  else if [ -x /bin/bash ]; then echo /bin/bash; \
 	  else echo sh; fi ; fi)
@@ -51,7 +76,6 @@
 HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 HOSTCXXFLAGS	= -O2
 
-CROSS_COMPILE 	= vax-dec-linux-
 
 # 	That's our default target when none is given on the command line
 #	Note that 'modules' will be added as a prerequisite as well, 
@@ -66,25 +90,23 @@
 KBUILD_BUILTIN := 1
 
 #	If we have only "make modules", don't compile built-in objects.
+#	When we're building modules with modversions, we need to consider
+#	the built-in objects during the descend as well, in order to
+#	make sure the checksums are uptodate before we record them.
 
 ifeq ($(MAKECMDGOALS),modules)
-  KBUILD_BUILTIN :=
+  KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
 endif
 
 #	If we have "make <whatever> modules", compile modules
 #	in addition to whatever we do anyway.
-
-ifneq ($(filter modules,$(MAKECMDGOALS)),)
-  KBUILD_MODULES := 1
-endif
-
 #	Just "make" or "make all" shall build modules as well
 
-ifeq ($(MAKECMDGOALS),)
+ifneq ($(filter all modules,$(MAKECMDGOALS)),)
   KBUILD_MODULES := 1
 endif
 
-ifneq ($(filter all,$(MAKECMDGOALS)),)
+ifeq ($(MAKECMDGOALS),)
   KBUILD_MODULES := 1
 endif
 
@@ -180,7 +202,7 @@
 DEPMOD		= /sbin/depmod
 KALLSYMS	= scripts/kallsyms
 PERL		= perl
-CHECK		= /home/torvalds/parser/check
+CHECK		= sparse
 MODFLAGS	= -DMODULE
 CFLAGS_MODULE   = $(MODFLAGS)
 AFLAGS_MODULE   = $(MODFLAGS)
@@ -264,7 +286,9 @@
 core-y		:= $(patsubst %/, %/built-in.o, $(core-y))
 drivers-y	:= $(patsubst %/, %/built-in.o, $(drivers-y))
 net-y		:= $(patsubst %/, %/built-in.o, $(net-y))
-libs-y		:= $(patsubst %/, %/lib.a, $(libs-y))
+libs-y1		:= $(patsubst %/, %/lib.a, $(libs-y))
+libs-y2		:= $(patsubst %/, %/built-in.o, $(libs-y))
+libs-y		:= $(libs-y1) $(libs-y2)
 
 ifdef include_config
 
@@ -284,18 +308,6 @@
 CFLAGS		+= -fomit-frame-pointer
 endif
 
-#	When we're building modules with modversions, we need to consider
-#	the built-in objects during the descend as well, in order to
-#	make sure the checksums are uptodate before we record them.
-
-ifdef CONFIG_MODVERSIONS
-ifeq ($(KBUILD_MODULES),1)
-ifneq ($(KBUILD_BUILTIN),1)
-  KBUILD_BUILTIN := 1
-endif
-endif
-endif
-
 #
 # INSTALL_PATH specifies where to place the updated kernel and system map
 # images.  Uncomment if you want to place them anywhere other than root.
@@ -354,7 +366,7 @@
 endef
 
 define rule_vmlinux
-	$(rule_vmlinux__)
+	$(rule_vmlinux__); \
 	$(NM) $@ | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
 endef
 
@@ -420,9 +432,8 @@
 	@echo '*** Warning: Overriding SUBDIRS on the command line can cause'
 	@echo '***          inconsistencies'
 endif
-	$(Q)mkdir -p $(MODVERDIR)
 endif
-	@echo '  Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
+	$(if $(CONFIG_MODULES),$(Q)mkdir -p $(MODVERDIR))
 
 #	This can be used by arch/$ARCH/Makefile to preprocess
 #	their vmlinux.lds.S file
@@ -444,9 +455,7 @@
 %.o: %.c scripts FORCE
 	$(Q)$(MAKE) $(build)=$(@D) $@
 %/:      scripts prepare FORCE
-	$(Q)$(MAKE) $(build)=$(@D)
-%.ko: scripts FORCE
-	$(Q)$(MAKE) $(build)=$(@D) $@
+	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D)
 %.lst: %.c scripts FORCE
 	$(Q)$(MAKE) $(build)=$(@D) $@
 %.s: %.S scripts FORCE
@@ -488,7 +497,7 @@
 	if expr length "$(KERNELRELEASE)" \> $(uts_len) >/dev/null ; then \
 	  echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \
 	  exit 1; \
-	fi;
+	fi; \
 	(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))'; \
@@ -782,25 +791,28 @@
 
 help:
 	@echo  'Cleaning targets:'
-	@echo  '  clean		- remove most generated files but keep the config'
-	@echo  '  mrproper	- remove all generated files + config + various backup files'
+	@echo  '  clean		  - remove most generated files but keep the config'
+	@echo  '  mrproper	  - remove all generated files + config + various backup files'
 	@echo  ''
 	@echo  'Configuration targets:'
-	@echo  '  oldconfig	- Update current config utilising a line-oriented program'
-	@echo  '  menuconfig	- Update current config utilising a menu based program'
-	@echo  '  xconfig	- Update current config utilising a X-based program'
-	@echo  '  defconfig	- New config with default answer to all options'
-	@echo  '  allmodconfig	- New config selecting modules when possible'
-	@echo  '  allyesconfig	- New config where all options are accepted with yes'
-	@echo  '  allnoconfig	- New minimal config'
+	@echo  '  oldconfig	  - Update current config utilising a line-oriented program'
+	@echo  '  menuconfig	  - Update current config utilising a menu based program'
+	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
+	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
+	@echo  '  defconfig	  - New config with default answer to all options'
+	@echo  '  allmodconfig	  - New config selecting modules when possible'
+	@echo  '  allyesconfig	  - New config where all options are accepted with yes'
+	@echo  '  allnoconfig	  - New minimal config'
 	@echo  ''
 	@echo  'Other generic targets:'
-	@echo  '  all		- Build all targets marked with [*]'
-	@echo  '* vmlinux	- Build the bare kernel'
-	@echo  '* modules	- Build all modules'
-	@echo  '  dir/file.[ois]- Build specified target only'
-	@echo  '  rpm		- Build a kernel as an RPM package'
-	@echo  '  tags/TAGS	- Generate tags file for editors'
+	@echo  '  all		  - Build all targets marked with [*]'
+	@echo  '* vmlinux	  - Build the bare kernel'
+	@echo  '* modules	  - Build all modules'
+	@echo  '  modules_install - Install all modules'
+	@echo  '  dir/            - Build all files in dir and below'
+	@echo  '  dir/file.[ois]  - Build specified target only'
+	@echo  '  rpm		  - Build a kernel as an RPM package'
+	@echo  '  tags/TAGS	  - Generate tags file for editors'
 	@echo  ''
 	@echo  'Documentation targets:'
 	@$(MAKE) --no-print-directory -f Documentation/DocBook/Makefile dochelp
@@ -808,6 +820,9 @@
 	@echo  'Architecture specific targets ($(ARCH)):'
 	@$(if $(archhelp),$(archhelp),\
 		echo '  No architecture specific help defined for $(ARCH)')
+	@echo  ''
+	@echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
+	@echo  '  make C=1   [targets] Check all c source with checker tool'
 	@echo  ''
 	@echo  'Execute "make" or "make all" to build all targets marked with [*] '
 	@echo  'For further info browse Documentation/kbuild/*'

[LV-commit] kernel-2.5/drivers/char Makefile,1.38,1.39

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.71


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile	24 Aug 2003 20:08:10 -0000	1.38
+++ Makefile	7 Sep 2003 15:00:49 -0000	1.39
@@ -84,8 +84,11 @@
 # Files generated that shall be removed upon make clean
 clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
 
+quiet_cmd_conmk = CONMK   $@
+      cmd_conmk = scripts/conmakehash $< > $@
+
 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
-	$(call do_cmd,CONMK   $@,$(objtree)/scripts/conmakehash $< > $@)
+	$(call cmd,conmk)
 
 $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 

[LV-commit] kernel-2.5/drivers Makefile,1.22,1.23

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.71


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	28 Aug 2003 22:30:25 -0000	1.22
+++ Makefile	7 Sep 2003 15:00:49 -0000	1.23
@@ -31,7 +31,7 @@
 obj-$(CONFIG_DIO)		+= dio/
 obj-$(CONFIG_SBUS)		+= sbus/
 obj-$(CONFIG_ZORRO)		+= zorro/
-obj-$(CONFIG_ALL_PPC)		+= macintosh/
+obj-$(CONFIG_PPC_PMAC)		+= macintosh/
 obj-$(CONFIG_MAC)		+= macintosh/
 obj-$(CONFIG_SGI)		+= sgi/
 obj-$(CONFIG_PARIDE) 		+= block/paride/
@@ -46,7 +46,6 @@
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
-obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/
 obj-$(CONFIG_ISDN_BOOL)		+= isdn/
 obj-$(CONFIG_MCA)		+= mca/
 obj-$(CONFIG_EISA)		+= eisa/

[LV-commit] kernel-2.5/drivers/net Makefile,1.28,1.29 Space.c,1.13,1.14

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

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

Modified Files:
	Makefile Space.c 
Log Message:
Merge with 2.5.71


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile	28 Aug 2003 22:30:25 -0000	1.28
+++ Makefile	7 Sep 2003 15:00:49 -0000	1.29
@@ -65,7 +65,7 @@
 obj-$(CONFIG_WINBOND_840) += mii.o
 obj-$(CONFIG_SUNDANCE) += sundance.o mii.o
 obj-$(CONFIG_HAMACHI) += hamachi.o mii.o
-obj-$(CONFIG_NET) += Space.o setup.o net_init.o loopback.o
+obj-$(CONFIG_NET) += Space.o net_init.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_ETHERTAP) += ethertap.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
@@ -175,7 +175,7 @@
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
+obj-$(CONFIG_AMD8111_ETH) += amd8111e.o mii.o
 
 # non-drivers/net drivers who want mii lib
 obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o

Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Space.c	28 Aug 2003 22:30:25 -0000	1.13
+++ Space.c	7 Sep 2003 15:00:49 -0000	1.14
@@ -107,9 +107,6 @@
 /* Detachable devices ("pocket adaptors") */
 extern int de620_probe(struct net_device *);
 
-/* FDDI adapters */
-extern int skfp_probe(struct net_device *dev);
-
 /* Fibre Channel adapters */
 extern int iph5526_probe(struct net_device *dev);
 
@@ -415,29 +412,6 @@
 	return -ENODEV;
 }
 
-#ifdef CONFIG_FDDI
-static int __init fddiif_probe(struct net_device *dev)
-{
-    unsigned long base_addr = dev->base_addr;
-
-    if (base_addr == 1)
-	    return 1;		/* ENXIO */
-
-    if (1
-#ifdef CONFIG_APFDDI
-	&& apfddi_init(dev)
-#endif
-#ifdef CONFIG_SKFP
-	&& skfp_probe(dev)
-#endif
-	&& 1 ) {
-	    return 1;	/* -ENODEV or -EAGAIN would be more accurate. */
-    }
-    return 0;
-}
-#endif
-
-
 #ifdef CONFIG_NET_FC
 static int fcif_probe(struct net_device *dev)
 {
@@ -628,52 +602,6 @@
 #define      NEXT_DEV        (&tr0_dev)
 
 #endif 
-
-#ifdef CONFIG_FDDI
-static struct net_device fddi7_dev = {
-	.name		= "fddi7",
-	.next		=  NEXT_DEV,
-	.init		= fddiif_probe
-};
-static struct net_device fddi6_dev = {
-	.name		= "fddi6",
-	.next		= &fddi7_dev,
-	.init		= fddiif_probe
-};
-static struct net_device fddi5_dev = {
-	.name		= "fddi5",
-	.next		= &fddi6_dev,
-	.init		= fddiif_probe
-};
-static struct net_device fddi4_dev = {
-	.name		= "fddi4",
-	.next		= &fddi5_dev,
-	.init		= fddiif_probe
-};
-static struct net_device fddi3_dev = {
-	.name		= "fddi3",
-	.next		= &fddi4_dev,
-	.init		= fddiif_probe
-};
-static struct net_device fddi2_dev = {
-	.name		= "fddi2",
-	.next		= &fddi3_dev,
-	.init		= fddiif_probe
-};
-static struct net_device fddi1_dev = {
-	.name		= "fddi1",
-	.next		= &fddi2_dev,
-	.init		= fddiif_probe
-};
-static struct net_device fddi0_dev = {
-	.name		= "fddi0",
-	.next		= &fddi1_dev,
-	.init		= fddiif_probe
-};
-#undef	NEXT_DEV
-#define	NEXT_DEV	(&fddi0_dev)
-#endif 
-
 
 #ifdef CONFIG_NET_FC
 static struct net_device fc1_dev = {

[LV-commit] kernel-2.5/drivers/mtd/maps iq80321.c,1.1.1.2,NONE nora.c,1.1.1.2,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/mtd/maps
In directory sc8-pr-cvs1:/tmp/cvs-serv16356/drivers/mtd/maps

Removed Files:
	iq80321.c nora.c 
Log Message:
Merge with 2.5.71


--- iq80321.c DELETED ---

--- nora.c DELETED ---

[LV-commit] kernel-2.5/drivers/mtd cmdline.c,1.1.1.3,NONE

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

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

Removed Files:
	cmdline.c 
Log Message:
Merge with 2.5.71


--- cmdline.c DELETED ---

[LV-commit] kernel-2.5/drivers/pcmcia pci_socket.c,1.1.1.10,NONE pci_socket.h,1.1.1.5,NONE

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

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

Removed Files:
	pci_socket.c pci_socket.h 
Log Message:
Merge with 2.5.71


--- pci_socket.c DELETED ---

--- pci_socket.h DELETED ---

[LV-commit] kernel-2.5/sound/pci/ice1712 ak4524.c,1.1.1.7,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/sound/pci/ice1712
In directory sc8-pr-cvs1:/tmp/cvs-serv16356/sound/pci/ice1712

Removed Files:
	ak4524.c 
Log Message:
Merge with 2.5.71


--- ak4524.c DELETED ---

[LV-commit] kernel-2.5/sound/core pcm_sgbuf.c,1.1.1.7,NONE

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

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

Removed Files:
	pcm_sgbuf.c 
Log Message:
Merge with 2.5.71


--- pcm_sgbuf.c DELETED ---

[LV-commit] kernel-2.5/include/linux/mtd nand_ids.h,1.1.1.1,NONE

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

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

Removed Files:
	nand_ids.h 
Log Message:
Merge with 2.5.71


--- nand_ids.h DELETED ---

[LV-commit] kernel-2.5/drivers/hotplug Kconfig,1.1.1.4,NONE Makefile,1.1.1.10,NONE acpiphp.h,1.1.1.3,NONE acpiphp_core.c,1.1.1.2,NONE acpiphp_glue.c,1.1.1.8,NONE acpiphp_pci.c,1.1.1.3,NONE acpiphp_res.c,1.1.1.2,NONE cpci_hotplug.h,1.1.1.1,NONE cpci_hotplug_core.c,1.1.1.5,NONE cpci_hotplug_pci.c,1.1.1.6,NONE cpcihp_generic.c,1.1.1.1,NONE cpcihp_zt5550.c,1.1.1.1,NONE cpcihp_zt5550.h,1.1.1.1,NONE cpqphp.h,1.1.1.7,NONE cpqphp_core.c,1.1.1.14,NONE cpqphp_ctrl.c,1.1.1.9,NONE cpqphp_nvram.c,1.1.1.6,NONE cpqphp_nvram.h,1.1.1.1,NONE cpqphp_pci.c,1.1.1.11,NONE cpqphp_sysfs.c,1.1.1.1,NONE ibmphp.h,1.1.1.4,NONE ibmphp_core.c,1.1.1.13,NONE ibmphp_ebda.c,1.1.1.6,NONE ibmphp_hpc.c,1.1.1.7,NONE ibmphp_pci.c,1.1.1.4,NONE ibmphp_res.c,1.1.1.5,NONE pci_hotplug.h,1.1.1.5,NONE pci_hotplug_core.c,1.1.1.19,NONE pcihp_skeleton.c,1.1.1.2,NONE

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

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

Removed Files:
	Kconfig Makefile acpiphp.h acpiphp_core.c acpiphp_glue.c 
	acpiphp_pci.c acpiphp_res.c cpci_hotplug.h cpci_hotplug_core.c 
	cpci_hotplug_pci.c cpcihp_generic.c cpcihp_zt5550.c 
	cpcihp_zt5550.h cpqphp.h cpqphp_core.c cpqphp_ctrl.c 
	cpqphp_nvram.c cpqphp_nvram.h cpqphp_pci.c cpqphp_sysfs.c 
	ibmphp.h ibmphp_core.c ibmphp_ebda.c ibmphp_hpc.c ibmphp_pci.c 
	ibmphp_res.c pci_hotplug.h pci_hotplug_core.c pcihp_skeleton.c 
Log Message:
Merge with 2.5.71


--- Kconfig DELETED ---

--- Makefile DELETED ---

--- acpiphp.h DELETED ---

--- acpiphp_core.c DELETED ---

--- acpiphp_glue.c DELETED ---

--- acpiphp_pci.c DELETED ---

--- acpiphp_res.c DELETED ---

--- cpci_hotplug.h DELETED ---

--- cpci_hotplug_core.c DELETED ---

--- cpci_hotplug_pci.c DELETED ---

--- cpcihp_generic.c DELETED ---

--- cpcihp_zt5550.c DELETED ---

--- cpcihp_zt5550.h DELETED ---

--- cpqphp.h DELETED ---

--- cpqphp_core.c DELETED ---

--- cpqphp_ctrl.c DELETED ---

--- cpqphp_nvram.c DELETED ---

--- cpqphp_nvram.h DELETED ---

--- cpqphp_pci.c DELETED ---

--- cpqphp_sysfs.c DELETED ---

--- ibmphp.h DELETED ---

--- ibmphp_core.c DELETED ---

--- ibmphp_ebda.c DELETED ---

--- ibmphp_hpc.c DELETED ---

--- ibmphp_pci.c DELETED ---

--- ibmphp_res.c DELETED ---

--- pci_hotplug.h DELETED ---

--- pci_hotplug_core.c DELETED ---

--- pcihp_skeleton.c DELETED ---

[LV-commit] kernel-2.5/include/linux rocket.h,1.1.1.1,NONE

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

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

Removed Files:
	rocket.h 
Log Message:
Merge with 2.5.71


--- rocket.h DELETED ---

[LV-commit] kernel-2.5/drivers/acorn/char defkeymap-acorn.c_shipped,1.1.1.1,NONE defkeymap-acorn.map,1.1.1.1,NONE keyb_arc.c,1.1.1.2,NONE mouse_ps2.c,1.1.1.4,NONE

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

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

Removed Files:
	defkeymap-acorn.c_shipped defkeymap-acorn.map keyb_arc.c 
	mouse_ps2.c 
Log Message:
Merge with 2.5.71


--- defkeymap-acorn.c_shipped DELETED ---

--- defkeymap-acorn.map DELETED ---

--- keyb_arc.c DELETED ---

--- mouse_ps2.c DELETED ---