linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.34,1.35

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.29


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile	9 Feb 2003 01:37:10 -0000	1.34
+++ Makefile	9 Feb 2003 02:57:38 -0000	1.35
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 28
+SUBLEVEL = 29
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -166,6 +166,15 @@
 		    help tags TAGS sgmldocs psdocs pdfdocs htmldocs \
 		    checkconfig checkhelp checkincludes
 
+# Helpers built in scripts/
+# ---------------------------------------------------------------------------
+
+scripts/docproc scripts/fixdep scripts/split-include : scripts ;
+
+.PHONY: scripts
+scripts:
+	@$(MAKE) -C scripts
+
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
 # Here goes the main Makefile
@@ -212,7 +221,7 @@
 
 CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 
-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -g \
+CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
 	  -fomit-frame-pointer -fno-strict-aliasing -fno-common
 AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
 
@@ -357,15 +366,6 @@
 	) > $@.tmp
 	@$(update-if-changed)
 
-# Helpers built in scripts/
-# ---------------------------------------------------------------------------
-
-scripts/fixdep scripts/split-include : scripts ;
-
-.PHONY: scripts
-scripts:
-	@$(MAKE) -C scripts
-
 # Generate module versions
 # ---------------------------------------------------------------------------
 
@@ -650,7 +650,7 @@
 		-name .\*.tmp -o -name .\*.d \) -type f -print \
 		| grep -v lxdialog/ | xargs rm -f
 	@rm -f $(CLEAN_FILES)
-	@$(MAKE) -C Documentation/DocBook clean
+	@$(MAKE) -f Documentation/DocBook/Makefile clean
 
 mrproper: clean archmrproper
 	@echo 'Making mrproper'
@@ -659,7 +659,7 @@
 		-type f -print | xargs rm -f
 	@rm -f $(MRPROPER_FILES)
 	@rm -rf $(MRPROPER_DIRS)
-	@$(MAKE) -C Documentation/DocBook mrproper
+	@$(MAKE) -f Documentation/DocBook/Makefile mrproper
 
 distclean: mrproper
 	@echo 'Making distclean'
@@ -732,10 +732,8 @@
 
 # Documentation targets
 # ---------------------------------------------------------------------------
-
-sgmldocs psdocs pdfdocs htmldocs:
-	@$(MAKE) -C Documentation/DocBook $@
-
+sgmldocs psdocs pdfdocs htmldocs: scripts
+	@$(MAKE) -f Documentation/DocBook/Makefile $@
 
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------

[LV-k25-commit] CVS: kernel-2.5/scripts docgen,1.1.1.1,NONE gen-all-syms,1.1.1.1,NONE

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

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

Removed Files:
	docgen gen-all-syms 
Log Message:
Merge with 2.5.29


--- docgen DELETED ---

--- gen-all-syms DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-s390 hdreg.h,1.1.1.1,NONE ide.h,1.1.1.6,NONE

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

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

Removed Files:
	hdreg.h ide.h 
Log Message:
Merge with 2.5.29


--- hdreg.h DELETED ---

--- ide.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-s390x hdreg.h,1.1.1.1,NONE

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

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

Removed Files:
	hdreg.h 
Log Message:
Merge with 2.5.29


--- hdreg.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/usb/input hid-lg3dff.c,1.1.1.1,NONE

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

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

Removed Files:
	hid-lg3dff.c 
Log Message:
Merge with 2.5.29


--- hid-lg3dff.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/media/video i2c-old.c,1.1.1.2,NONE i2c-parport.c,1.1.1.1,NONE

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

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

Removed Files:
	i2c-old.c i2c-parport.c 
Log Message:
Merge with 2.5.29


--- i2c-old.c DELETED ---

--- i2c-parport.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/input/keyboard ps2serkbd.c,1.1.1.1,NONE

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

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

Removed Files:
	ps2serkbd.c 
Log Message:
Merge with 2.5.29


--- ps2serkbd.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/ide ata-timing.h,1.1.1.5,NONE

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

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

Removed Files:
	ata-timing.h 
Log Message:
Merge with 2.5.29


--- ata-timing.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/scripts .cvsignore,1.3,1.4

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

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

Modified Files:
	.cvsignore 
Log Message:
new target: fixdep

Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2002 00:33:40 -0000	1.3
+++ .cvsignore	9 Feb 2003 01:53:54 -0000	1.4
@@ -4,3 +4,4 @@
 *.lst
 mkdep
 split-include
+fixdep

[LV-k25-commit] CVS: kernel-2.5/security .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
Add .cvsignore file

--- NEW FILE ---
*.a.flags
*.o.flags
.depend
*.lst

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax hardirq.h,1.3,1.4 softirq.h,1.3,1.4 system.h,1.6,1.7

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

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

Modified Files:
	hardirq.h softirq.h system.h 
Log Message:
2.5.28 removed the big IRQ lock.  We also now require some of the
preemption definitions (even though we don't support preemption yet).


Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/hardirq.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hardirq.h	20 May 2002 00:33:39 -0000	1.3
+++ hardirq.h	9 Feb 2003 01:49:23 -0000	1.4
@@ -20,21 +20,63 @@
 #include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
 
 /*
- * Are we in an interrupt context? Either doing bottom half
- * or hardware interrupt processing?
+ * We put the hardirq and softirq counter into the preemption
+ * counter.  The bitmask has the following meaning:
+ *
+ * - bits 0-7 are the preemption count (max depth: 256)
+ * - bits 8-15 are the softirq count (max # of softirqs: 256)
+ * - bits 16-30 are the hardirq count (max # of hardirqs: 256)
+ * - bit 31 is the PREEMPT_ACTIVE flag
  */
-#define in_interrupt() ({ const int __cpu = smp_processor_id(); \
-	(local_irq_count(__cpu) + local_bh_count(__cpu) != 0); })
 
-#define in_irq() (local_irq_count(smp_processor_id()) != 0)
+#define PREEMPT_BITS	8
+#define SOFTIRQ_BITS	8
+#define HARDIRQ_BITS	15
 
-#ifndef CONFIG_SMP
+#define PREEMPT_SHIFT	0
+#define SOFTIRQ_SHIFT	(PREEMPT_SHIFT + PREEMPT_BITS)
+#define HARDIRQ_SHIFT	(SOFTIRQ_SHIFT + SOFTIRQ_BITS)
+
+#define __MASK(x)	((1UL << (x))-1)
+
+#define PREEMPT_MASK	(__MASK(PREEMPT_BITS) << PREEMPT_SHIFT)
+#define HARDIRQ_MASK	(__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT)
+#define SOFTIRQ_MASK	(__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT)
+
+#define hardirq_count()	(preempt_count() & HARDIRQ_MASK)
+#define softirq_count()	(preempt_count() & SOFTIRQ_MASK)
+#define irq_count()	(preempt_count() & (HARDIRQ_MASK|SOFTIRQ_MASK))
+
+#define PREEMPT_OFFSET	(1UL << PREEMPT_SHIFT)
+#define SOFTIRQ_OFFSET	(1UL << SOFTIRQ_SHIFT)
+#define HARDIRQ_OFFSET	(1UL << HARDIRQ_SHIFT)
+
+/*
+ * The hardirq mask has to be large enough to have space
+ * for potentially all IRQ sources in the system nesting
+ * on a single CPU:
+ */
+#if (1 << HARDIRQ_BITS) < NR_IRQS
+# error HARDIRQ_BITS is too low!
+#endif
+
+/*
+ * Are we doing bottom half or hardware interrupt processing?
+ * Are we in a softirq context? Interrupt context?
+ */
+#define in_irq()	hardirq_count()
+#define in_softirq()	softirq_count()
+#define in_interrupt()	irq_count()
 
-#define hardirq_trylock(cpu)	(local_irq_count(cpu) == 0)
-#define hardirq_endlock(cpu)	do { } while (0)
+#define hardirq_trylock()	(!in_interrupt())
+#define hardirq_endlock()	do { } while (0)
 
-#define irq_enter(cpu)	(local_irq_count(cpu)++)
-#define irq_exit(cpu)	(local_irq_count(cpu)--)
+#define irq_enter()	(preempt_count() += HARDIRQ_OFFSET)
+
+
+#ifndef CONFIG_SMP
+/* FIXME: implement irq_exit() properly when we do CONFIG_PREEMPT */
+#define irq_exit()	(preempt_count() -= HARDIRQ_OFFSET)
 
 #define synchronize_irq()	barrier();
 

Index: softirq.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/softirq.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- softirq.h	20 May 2002 00:33:39 -0000	1.3
+++ softirq.h	9 Feb 2003 01:49:23 -0000	1.4
@@ -1,20 +1,24 @@
 #ifndef _VAX_SOFTIRQ_H
 #define _VAX_SOFTIRQ_H
 
-#include <asm/atomic.h>
-#include <asm/hardirq.h>
+#include <linux/preempt.h>
 
-#define __cpu_bh_enable(cpu) \
-		do { barrier(); local_bh_count(cpu)--; } while (0)
-#define cpu_bh_disable(cpu) \
-		do { local_bh_count(cpu)++; barrier(); } while (0)
-
-#define local_bh_disable()	cpu_bh_disable(smp_processor_id())
-#define local_bh_enable()	__cpu_bh_enable(smp_processor_id())
-#define __local_bh_enable()	__cpu_bh_enable(smp_processor_id())
-
-#define in_softirq() (local_bh_count(smp_processor_id()) != 0)
+#define local_bh_disable() \
+	do { preempt_count() += SOFTIRQ_OFFSET; barrier(); } while (0)
+#define __local_bh_enable() \
+	do { barrier(); preempt_count() -= SOFTIRQ_OFFSET; } while (0)
 
+#define local_bh_enable()	__local_bh_enable()
 
+/* FIXME: implement this like i386 or arm */
+#if 0
+#define local_bh_enable()                                              \
+ do {                                                                   \
+       __local_bh_enable();                                            \
+       if (unlikely(!in_interrupt() && softirq_pending(smp_processor_id()))) \
+                __asm__("bl%? __do_softirq": : : "lr");/* out of line */\
+       preempt_check_resched();                                        \
+ } while (0)
+#endif
 
 #endif /* _VAX_SOFTIRQ_H */

Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/system.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system.h	26 Jan 2003 17:06:29 -0000	1.6
+++ system.h	9 Feb 2003 01:49:23 -0000	1.7
@@ -10,9 +10,6 @@
 
 #define prepare_arch_schedule(prev)	do { } while(0)
 #define finish_arch_schedule(prev)	do { } while(0)
-#define prepare_arch_switch(rq)		do { } while(0)
-#define finish_arch_switch(rq)		spin_unlock_irq(&(rq)->lock)
-
 
 #include <asm/psl.h>
 
@@ -36,7 +33,10 @@
 
 struct task_struct;	/* one of the stranger aspects of C forward declarations.. */
 
-extern void switch_to(struct task_struct*, struct task_struct*, struct task_struct *);
+/* This macro wrapper around switch_to() means that the compiler
+   doesn't need to push the unused 3rd argument on the stack */
+extern void __switch_to(struct task_struct*, struct task_struct*);
+#define switch_to(prev, next, last)	__switch_to((prev), (next))
 
 /* mb is the alpha instruction to cause serialisation of memory
    operations. According to a software note in section 5.5.4 of 
@@ -74,8 +74,11 @@
         __r0;                                                   \
 })
 
-#define __cli()			setipl(31)
-
+#define local_irq_save(flags)           ((flags) = getipl())
+#define local_irq_save_off(flags)	((flags) = swpipl(31))
+#define local_irq_restore(flags)	setipl(flags)
+#define local_irq_disable()		setipl(31)
+ 
 /* If we're handling an interrupt (i.e. the IS bit is set in the
    PSL and we're on the interrupt stack), then we must not enable
    interrupts by dropping IPL all the way to 0.  If we do, and 
@@ -85,7 +88,7 @@
 
    So, instead, we drop IPL to 1 if we're running on the interrupt
    stack, thus making sure that REI will be kept happy. */
-/* since 2.4.6, there is now a local_irq_enable -> __sti() in 
+/* since 2.4.6, there is now a local_irq_enable in 
  * the softirq/tasklet code - which is fine, except when we are 
  * interrupted servicing a device interrupt with IPL=0x14 (say).
  * in this case, if we set IPL to 1, we return to the higher IPL
@@ -94,7 +97,7 @@
  */
 
 extern __inline__ void
-__sti(void)
+local_irq_enable(void)
 {
 	if (__psl.is) {
 	   if (__psl.prevmode != PSL_MODE_KERNEL) {
@@ -106,39 +109,8 @@
 	}
 }
 
-#define __save_flags(flags)	((flags) = getipl())
-#define __save_and_cli(flags)	((flags) = swpipl(31))
-#define __restore_flags(flags)	setipl(flags)
-
-#define local_irq_save(flags)           __save_and_cli(flags)
-#define local_irq_restore(flags)        __restore_flags(flags)
-#define local_irq_disable()             __cli()
-#define local_irq_enable()              __sti()
- 
 #ifdef __SMP__
-
-extern int global_irq_holder;
-
-#define save_and_cli(flags)     (save_flags(flags), cli())
-
-extern void __global_cli(void);
-extern void __global_sti(void);
-extern unsigned long __global_save_flags(void);
-extern void __global_restore_flags(unsigned long flags);
-
-#define cli()                   __global_cli()
-#define sti()                   __global_sti()
-#define save_flags(flags)	((flags) = __global_save_flags())
-#define restore_flags(flags)    __global_restore_flags(flags)
-
-#else /* __SMP__ */
-
-#define cli()			__cli()
-#define sti()			__sti()
-#define save_flags(flags)	__save_flags(flags)
-#define save_and_cli(flags)	__save_and_cli(flags)
-#define restore_flags(flags)	__restore_flags(flags)
-
+#error SMP not supported
 #endif /* __SMP__ */
 
 #define nop() __asm__ __volatile__ ("nop")

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel interrupt.c,1.9,1.10

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

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

Modified Files:
	interrupt.c 
Log Message:
2.5.28 removed the big IRQ lock.  We also now require some of the
preemption definitions (even though we don't support preemption yet).


Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/interrupt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- interrupt.c	28 Dec 2002 02:13:08 -0000	1.9
+++ interrupt.c	9 Feb 2003 01:49:22 -0000	1.10
@@ -419,25 +419,19 @@
    need to walk the list of irqactions as in x86 because we don't have
    shared interrupts on the VAX */
 
-static inline int dispatch_irq(struct pt_regs *regs, struct irqvector *vec)
+static inline void dispatch_irq(struct pt_regs *regs, struct irqvector *vec)
 {
-        int status;
 	struct irqaction *action;
 	int vec_num;
 
-        status = 1;     /* Force the "do bottom halves" bit */
-
-		
 	action = &vec->action;
 	vec_num = vec->vec_num;
 	
-        status |= action->flags;
         action->handler(vec_num, action->dev_id, regs);
 
-        if (status & SA_SAMPLE_RANDOM)
+        if (action->flags & SA_SAMPLE_RANDOM) {
                 add_interrupt_randomness(vec_num);
-
-        return status;
+	}
 }
 
 /* This is called once we know that an interrupt or exception is actually 
@@ -446,28 +440,22 @@
 static inline void do_irq(struct pt_regs *regs, struct irqvector *vec)
 {
         int flags;
-	int status;
-	int cpu;
+
 	/* Fake a single-priority-level interrupt system by raising IPL
 	   to 31 for _any_ interrupt.  This is such a waste of the VAX's
 	   hardware capabilities... */
 
-	cpu=smp_processor_id();
-	irq_enter(cpu);
+	irq_enter();
 	
 	save_and_cli(flags);
 
-	status = dispatch_irq(regs, vec);
-	irq_exit(cpu);
+	dispatch_irq(regs, vec);
+	irq_exit();
 
 	restore_flags(flags);
-	//	if (status) {
-//	if (softirq_active(cpu)&softirq_mask(cpu)) {
-  if (softirq_pending(cpu)) { 
-     do_softirq();
-	  //	   }
+	if (softirq_pending(smp_processor_id())) { 
+		do_softirq();
 	}
-
 }
 
 static inline void do_exception(struct pt_regs *regs, struct irqvector *vec, void *excep_info)
@@ -648,12 +636,7 @@
         if (!handler)
                 return -EINVAL;
 
-#ifdef KMALLOC_WORKS
-        vector = (struct irqvector *)
-                        kmalloc(sizeof(struct irqvector), GFP_KERNEL);
-#else
 	vector = alloc_irqvector();
-#endif
 
         if (!vector)
                 return -ENOMEM;
@@ -671,11 +654,7 @@
         retval = hook_scb_vector(irq, vector, 1);
 
         if (retval)
-#ifdef KMALLOC_WORKS
-                kfree(vector);
-#else
 		free_irqvector(vector);
-#endif
 
         return retval;
 }
@@ -715,11 +694,7 @@
 
 	restore_flags(flags);
 
-#ifdef KMALLOC_WORKS
-                kfree(vector);
-#else
-		free_irqvector(vector);
-#endif
+	free_irqvector(vector);
 }
 
 void free_irq(unsigned int irq, void *dev_id)
@@ -788,12 +763,7 @@
         if (!handler)
                 return -EINVAL;
 
-#ifdef KMALLOC_WORKS
-        vector = (struct irqvector *)
-                        kmalloc(sizeof(struct irqvector), GFP_KERNEL);
-#else
 	vector = alloc_irqvector();
-#endif
 
         if (!vector)
                 return -ENOMEM;
@@ -807,11 +777,7 @@
         
 
         if (retval)
-#ifdef KMALLOC_WORKS
-                kfree(vector);
-#else
 		free_irqvector(vector);
-#endif
 
         return retval;
 }

[LV-k25-commit] CVS: kernel-2.5/include/asm-ppc64 md.h,1.1.1.1,NONE vc_ioctl.h,1.1.1.1,NONE

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

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

Removed Files:
	md.h vc_ioctl.h 
Log Message:
Merge with 2.5.28


--- md.h DELETED ---

--- vc_ioctl.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax descriptor.h,1.3,1.4 processor.h,1.6,1.7 rpb.h,1.3,1.4 vaxcpu.h,1.3,1.4

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

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

Modified Files:
	descriptor.h processor.h rpb.h vaxcpu.h 
Log Message:
Remove text after #endif that GCC 3 doesn't like


Index: descriptor.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/descriptor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- descriptor.h	20 May 2002 00:33:39 -0000	1.3
+++ descriptor.h	9 Feb 2003 01:46:02 -0000	1.4
@@ -46,4 +46,4 @@
    void *pointer;
 };
 
-#endif _VAX_DESCRIPTOR_H
+#endif /* _VAX_DESCRIPTOR_H */

Index: processor.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/processor.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- processor.h	24 Jan 2003 00:28:32 -0000	1.6
+++ processor.h	9 Feb 2003 01:46:02 -0000	1.7
@@ -108,4 +108,4 @@
 #define cpu_relax()      do { } while (0)  
 
 
-#endif _VAX_PROCESSOR_H
+#endif /* _VAX_PROCESSOR_H */

Index: rpb.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/rpb.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpb.h	20 May 2002 00:33:39 -0000	1.3
+++ rpb.h	9 Feb 2003 01:46:03 -0000	1.4
@@ -78,4 +78,5 @@
 
 extern struct rpb_struct boot_rpb;     
    
-#endif _VAX_RPB_H   
+#endif /* _VAX_RPB_H */
+

Index: vaxcpu.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/vaxcpu.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vaxcpu.h	20 May 2002 00:33:39 -0000	1.3
+++ vaxcpu.h	9 Feb 2003 01:46:03 -0000	1.4
@@ -276,4 +276,4 @@
 
 #define NVAX_SIDEX_ADDR 0x20040004
 
-#endif _VAX_CPU_H
+#endif /* _VAX_CPU_H */

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel process.c,1.11,1.12

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

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

Modified Files:
	process.c 
Log Message:
We now define switch_to() as a macro which drops the unused argument
and calls __switch_to().


Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- process.c	26 Jan 2003 17:06:27 -0000	1.11
+++ process.c	9 Feb 2003 01:44:54 -0000	1.12
@@ -46,7 +46,7 @@
 	/* nothing */
 }
 
-void switch_to(struct task_struct* prev, struct task_struct* next, struct task_struct *last)
+void __switch_to(struct task_struct* prev, struct task_struct* next)
 {
         unsigned long pcbb; 	/* physical address of new pcb */
 

[LV-k25-commit] CVS: kernel-2.5/include/asm-ppc vc_ioctl.h,1.1.1.1,NONE

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

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

Removed Files:
	vc_ioctl.h 
Log Message:
Merge with 2.5.28


--- vc_ioctl.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/video/aty mach64.h,1.1.1.1,NONE

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

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

Removed Files:
	mach64.h 
Log Message:
Merge with 2.5.28


--- mach64.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/video aty128.h,1.1.1.1,NONE fbcon-mac.c,1.1.1.2,NONE fbcon-vga.c,1.1.1.2,NONE sgivwfb.h,1.1.1.1,NONE

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

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

Removed Files:
	aty128.h fbcon-mac.c fbcon-vga.c sgivwfb.h 
Log Message:
Merge with 2.5.28


--- aty128.h DELETED ---

--- fbcon-mac.c DELETED ---

--- fbcon-vga.c DELETED ---

--- sgivwfb.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char/pcmcia serial_cs.c,1.1.1.1,NONE

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

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

Removed Files:
	serial_cs.c 
Log Message:
Merge with 2.5.28


--- serial_cs.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char acpi_serial.c,1.1.1.1,NONE serial.c,1.1.1.9,NONE

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

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

Removed Files:
	acpi_serial.c serial.c 
Log Message:
Merge with 2.5.28


--- acpi_serial.c DELETED ---

--- serial.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char tty_io.c,1.1.1.11,1.2

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

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

Modified Files:
	tty_io.c 
Log Message:
VAX doesn't need an explicit serial_console_init() call.  We've already
registered our serial consoles at this point.


Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.1.1.11
retrieving revision 1.2
diff -u -r1.1.1.11 -r1.2
--- tty_io.c	31 Jan 2003 14:29:34 -0000	1.1.1.11
+++ tty_io.c	9 Feb 2003 01:41:15 -0000	1.2
@@ -2192,6 +2192,8 @@
  	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 */

[LV-k25-commit] CVS: kernel-2.5/drivers/vax/bus qbus.c,1.1,1.2

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

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

Modified Files:
	qbus.c 
Log Message:
It's possible for qbus_alloc_mapregs() to be called from interrupt
context.  Hence need GFP_ATOMIC, not GFP_KERNEL.


Index: qbus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/qbus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qbus.c	18 Jul 2002 23:39:32 -0000	1.1
+++ qbus.c	9 Feb 2003 01:39:56 -0000	1.2
@@ -85,7 +85,7 @@
 {
 	struct vax_dmamap *map;
 
-	map = kmalloc(sizeof(struct vax_dmamap), GFP_KERNEL);
+	map = kmalloc(sizeof(struct vax_dmamap), GFP_ATOMIC);
 	if (map != NULL) {
 		int reg;
 		unsigned int pagelets;

[LV-k25-commit] CVS: kernel-2.5/kernel panic.c,1.4,1.5

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

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

Modified Files:
	panic.c 
Log Message:
Merge with 2.5.28


Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- panic.c	29 Jan 2003 01:46:49 -0000	1.4
+++ panic.c	9 Feb 2003 01:37:11 -0000	1.5
@@ -97,7 +97,7 @@
 #ifdef CONFIG_VAX
 	machine_halt();
 #endif
-	sti();
+	local_irq_enable();
 	for(;;) {
 		CHECK_EMERGENCY_SYNC
 	}

[LV-k25-commit] CVS: kernel-2.5/drivers/net Space.c,1.4,1.5

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

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

Modified Files:
	Space.c 
Log Message:
Merge with 2.5.28


Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Space.c	16 Dec 2002 01:06:00 -0000	1.4
+++ Space.c	9 Feb 2003 01:37:11 -0000	1.5
@@ -99,7 +99,7 @@
 extern int mvme147lance_probe(struct net_device *dev);
 extern int tc515_probe(struct net_device *dev);
 extern int lance_probe(struct net_device *dev);
-extern int mace68k_probe(struct net_device *dev);
+extern int mace_probe(struct net_device *dev);
 extern int macsonic_probe(struct net_device *dev);
 extern int mac8390_probe(struct net_device *dev);
 extern int mac89x0_probe(struct net_device *dev);
@@ -356,7 +356,7 @@
 	{mvme147lance_probe, 0},
 #endif
 #ifdef CONFIG_MACMACE		/* Mac 68k Quadra AV builtin Ethernet */
-	{mace68k_probe, 0},
+	{mace_probe, 0},
 #endif
 #ifdef CONFIG_MACSONIC		/* Mac SONIC-based Ethernet of all sorts */ 
 	{macsonic_probe, 0},

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.16,1.17

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.28


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile	29 Jan 2003 01:46:47 -0000	1.16
+++ Makefile	9 Feb 2003 01:37:10 -0000	1.17
@@ -13,20 +13,18 @@
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
 export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
-			misc.o pty.o random.o selection.o serial.o \
+			misc.o pty.o random.o selection.o \
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
 			ip2main.o
 
 KEYMAP   =defkeymap.o
 KEYBD    =pc_keyb.o
 CONSOLE  =console.o
-SERIAL   =serial.o
 
 ifeq ($(ARCH),s390)
   KEYMAP   =
   KEYBD    =
   CONSOLE  =
-  SERIAL   =
 endif
 
 ifeq ($(ARCH),mips)
@@ -39,7 +37,6 @@
   KEYMAP   =
   KEYBD    =
   CONSOLE  =
-  SERIAL   =
 endif
 
 ifeq ($(ARCH),m68k)
@@ -48,7 +45,15 @@
    else
       KEYBD =
    endif
-   SERIAL   =
+endif
+
+ifdef CONFIG_Q40
+  KEYBD += q40_keyb.o
+  SERIAL = serial.o
+endif
+
+ifdef CONFIG_APOLLO
+  KEYBD += dn_keyb.o
 endif
 
 ifeq ($(ARCH),arm)
@@ -96,15 +101,6 @@
 
 ifeq ($(CONFIG_BAGET_MIPS),y)
   KEYBD    =
-  SERIAL   =
-endif
-
-ifeq ($(CONFIG_NINO),y)
-  SERIAL   =
-endif
-
-ifneq ($(CONFIG_SUN_SERIAL),)
-  SERIAL   =
 endif
 
 ifeq ($(CONFIG_QTRONIX_KEYBOARD),y)
@@ -113,11 +109,7 @@
 endif
 
 obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
-obj-$(CONFIG_SERIAL) += $(SERIAL)
-obj-$(CONFIG_SERIAL_ACPI) += acpi_serial.o
-obj-$(CONFIG_SERIAL_21285) += serial_21285.o
-obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
-obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o
+#obj-$(CONFIG_SERIAL) += $(SERIAL) # Fix for decserial.o
 
 ifndef CONFIG_SUN_KEYBOARD
   obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)