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

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

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

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7464/include/asm-vax/bus

Modified Files:
	vsbus.h 
Log Message:
Move all the current VSBUS code into drivers/vax/bus/vsbus.  I'm not
moving the irq auto-probe code since no working driver uses it at the
moment.  I'm very reluctant to resurrect the autoprobe code.  I'm
convinced that we can avoid autoprobing by find out where the interrupt
vector lookup tables are stored on all the newer machines.


Index: vsbus.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bus/vsbus.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vsbus.h	10 May 2004 23:20:34 -0000	1.1
+++ vsbus.h	18 Sep 2004 23:06:34 -0000	1.2
@@ -6,6 +6,30 @@
 #include <asm/dma.h>
 #include <linux/device.h>
 
+struct vsbus_registers {
+	unsigned long vs_hltcod;
+	unsigned long vc_410msr;
+	unsigned long vc_410cear;       /* VS2K */
+	unsigned char vc_intmsk;        /* Interrupt mask register */
+	unsigned char vc_vdcorg;        /* Mono display origin */
+	unsigned char vc_vdcsel;        /* Video interrupt select */
+	unsigned char vc_intreq;        /* Interrupt request register */
+#define vc_intclr vc_intreq
+	unsigned short vc_diagdsp;
+	unsigned short pad4;
+	unsigned long vc_parctl;
+#define vc_bwf0 vc_parctl
+	unsigned short pad5;
+	unsigned short pad6;
+	unsigned short vc_diagtimu;
+	unsigned short vc_diagtme;
+#define vc_diagtimm vc_diagtme
+};
+
+#define VSA_CLOCK_BASE		0x200b0000
+#define VSA_BASE_REGS		0x20080000
+#define VSA_KA55_BASE_REGS	0x25c00000
+
 /* Driver model support */
 extern struct bus_type vsbus_bus_type;
 
@@ -43,11 +67,12 @@
 void vsbus_add_fixed_device(struct device *parent, char *name, 
 	unsigned int phys_base, unsigned int irqindex);
 
-
 /* To keep things a bit simpler, and because all the machines fit this
-   requirement, we only allow one VSBUS adapter to exist in the system. */
+   requirement, we only allow one VSBUS adapter to exist in the system,
+   so this function can only be called once.  The hardware-specific
+   VSBUS adapter drivers call this at init time.  */
 
-extern unsigned int vsbus_rom_vectors[8];
+int init_vsbus_adapter(unsigned int *vectors, unsigned long registers);
 
 #endif /* __VAX_BUS_VSBUS_H */
 

[LV-k25-commit] kernel-2.5/arch/vax/kernel clock.c,1.5,1.6 cpu_ka42.c,1.14,1.15 cpu_ka43.c,1.17,1.18 cpu_ka46.c,1.15,1.16

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7464/arch/vax/kernel

Modified Files:
	clock.c cpu_ka42.c cpu_ka43.c cpu_ka46.c 
Log Message:
Move all the current VSBUS code into drivers/vax/bus/vsbus.  I'm not
moving the irq auto-probe code since no working driver uses it at the
moment.  I'm very reluctant to resurrect the autoprobe code.  I'm
convinced that we can avoid autoprobing by find out where the interrupt
vector lookup tables are stored on all the newer machines.


Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cpu_ka46.c	6 Aug 2004 00:01:07 -0000	1.15
+++ cpu_ka46.c	18 Sep 2004 23:06:33 -0000	1.16
@@ -18,7 +18,6 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/vaxcpu.h>
-#include <asm/vsa.h>
 #include <asm/ka46.h>
 #include <asm/clock.h>   /* for clock_init routines */
 #include <asm/bus/vsbus.h>
@@ -121,9 +120,6 @@
 static void ka46_init_devices(void)
 {
 	printk("ka46: init_devices\n");
-#ifdef CONFIG_VSBUS
-	vsbus_setup();
-#endif /* CONFIG_VSBUS */
 	
 	/* Initialise the DMA area */
 	ka46_dma_init();

Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cpu_ka43.c	8 Aug 2004 23:47:03 -0000	1.17
+++ cpu_ka43.c	18 Sep 2004 23:06:33 -0000	1.18
@@ -23,7 +23,6 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/vaxcpu.h>
-#include <asm/vsa.h>
 #include <asm/tlbflush.h>
 #include <asm/ka43.h>
 #include <asm/clock.h>		/* For clock_init routines */
@@ -154,13 +153,6 @@
 	ka43_cache_reset();
 }
 
-static void ka43_init_devices(void)
-{
-#ifdef CONFIG_VSBUS
-	vsbus_setup();
-#endif /* CONFIG_VSBUS */
-}
-
 
 static const char *ka43_cpu_type_str(void)
 {
@@ -240,7 +232,6 @@
 	.post_vm_putchar = dz11_putchar,
 	.post_vm_getchar = dz11_getchar,
 	.mcheck = ka43_mcheck,
-	.init_devices = ka43_init_devices,
 	.cpu_type_str = ka43_cpu_type_str,
 	.clock_init = ka4x_clock_init,
 };

Index: clock.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/clock.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- clock.c	26 Feb 2004 06:26:24 -0000	1.5
+++ clock.c	18 Sep 2004 23:06:33 -0000	1.6
@@ -25,7 +25,7 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/clock.h>		/* for TODR, if anyone feels like implementing it */
-#include <asm/vsa.h>
+#include <asm/bus/vsbus.h>
 #include <linux/mc146818rtc.h>	/* includes asm/mc146818rtc.h */
 				/*  - needed for offsets in debug output */
 

Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cpu_ka42.c	8 Aug 2004 23:35:30 -0000	1.14
+++ cpu_ka42.c	18 Sep 2004 23:06:33 -0000	1.15
@@ -17,9 +17,7 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/vaxcpu.h>
-#include <asm/vsa.h>
 #include <asm/clock.h>		/* For clock_init routines */
-
 #include <asm/bus/vsbus.h>
  
 static void ka42_pre_vm_init(void)
@@ -41,13 +39,6 @@
 #endif
 }
 
-static void ka42_init_devices(void)
-{
-#ifdef CONFIG_VSBUS
-	vsbus_setup();
-#endif
-}
-
 static const char *ka42_cpu_type_str(void)
 {
    return "KA42";
@@ -60,7 +51,6 @@
 	.pre_vm_getchar = ka4x_prom_getchar, 
 	.post_vm_putchar = dz11_putchar,
 	.post_vm_getchar = dz11_getchar,
-	.init_devices = ka42_init_devices,
 	.cpu_type_str = ka42_cpu_type_str,
 	.clock_init = ka4x_clock_init,
 };

[LV-k25-commit] kernel-2.5/include/asm-vax vsa.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.sourceforge.net:/tmp/cvs-serv7464/include/asm-vax

Modified Files:
	vsa.h 
Log Message:
Move all the current VSBUS code into drivers/vax/bus/vsbus.  I'm not
moving the irq auto-probe code since no working driver uses it at the
moment.  I'm very reluctant to resurrect the autoprobe code.  I'm
convinced that we can avoid autoprobing by find out where the interrupt
vector lookup tables are stored on all the newer machines.


Index: vsa.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/vsa.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vsa.h	3 Jun 2004 21:45:43 -0000	1.6
+++ vsa.h	18 Sep 2004 23:06:33 -0000	1.7
@@ -1,5 +1,6 @@
 #ifndef _ASM_VAX_VSA_H
 #define _ASM_VAX_VSA_H
+#warning This file is obsolete - use <asm/bus/vsbus.h>
 
 struct vs_cpu {
 	unsigned long vs_hltcod;
@@ -22,15 +23,8 @@
 };
 
 extern int vsbus_setup(void);
-extern int vsbus_enable_int(int bit_nr);
-extern int vsbus_disable_int(int bit_nr);
-extern int vsbus_clear_int(int bit_nr);
 extern int vsbus_probe_irq(void);
 extern int vsbus_probe_irq_on(void);
 extern unsigned char vsbus_probe_irq_report(void);
 
-#define VSA_CLOCK_BASE	 0x200b0000
-#define VSA_BASE_REGS 0x20080000
-#define VSA_KA55_BASE_REGS 0x25c00000
-
 #endif /* _ASM_VAX_VSA_H */

[LV-k25-commit] kernel-2.5/drivers/vax/bus vsbus-ka4x.c,1.2,1.3 vsbus.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.sourceforge.net:/tmp/cvs-serv7464/drivers/vax/bus

Modified Files:
	vsbus-ka4x.c vsbus.c 
Log Message:
Move all the current VSBUS code into drivers/vax/bus/vsbus.  I'm not
moving the irq auto-probe code since no working driver uses it at the
moment.  I'm very reluctant to resurrect the autoprobe code.  I'm
convinced that we can avoid autoprobing by find out where the interrupt
vector lookup tables are stored on all the newer machines.


Index: vsbus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/vsbus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vsbus.c	10 May 2004 23:20:34 -0000	1.1
+++ vsbus.c	18 Sep 2004 23:06:33 -0000	1.2
@@ -26,12 +26,32 @@
 #include <linux/init.h>
 #include <linux/device.h>
 
+#include <asm/io.h>
 #include <asm/bus/vsbus.h>
 
-#include <asm/vsa.h>
-
 #define VSBUS_DEBUG 1
 
+static struct vsbus_registers *vs_cpu_ptr;
+
+static unsigned int vsbus_rom_vectors[VSBUS_NR_IRQS];
+
+int init_vsbus_adapter(unsigned int *vectors, unsigned long registers)
+{
+	if (vs_cpu_ptr) {
+		printk("vsbus: already initialized\n");
+		return -EBUSY;
+	}
+
+	memcpy(vsbus_rom_vectors, vectors, VSBUS_NR_IRQS * sizeof(unsigned int));
+
+	vs_cpu_ptr = ioremap(registers, 0x80);
+	if (!vs_cpu_ptr) {
+		return -EAGAIN;
+	}
+
+	return 0;
+}
+
 /* Interrupt vector handling on VSBUS devices is a bit unusual (for
    a VAX).  There are up to 8 interrupt sources.  Each source has
    a bit in the INTREQ/INTCLR register and the INTMSK register.
@@ -57,7 +77,21 @@
    at physical address 0x20040020, which contains the interrupt
    vectors.  The hardware-specific driver fills in this table. */
 
-unsigned int vsbus_rom_vectors[VSBUS_NR_IRQS];
+
+void vsbus_enable_int(int bit_nr)
+{
+	vs_cpu_ptr->vc_intmsk |= 1<<bit_nr;
+}
+
+void vsbus_clear_int(int bit_nr)
+{
+	vs_cpu_ptr->vc_intclr = 1<<bit_nr;
+}
+
+void vsbus_disable_int(int bit_nr)
+{
+	vs_cpu_ptr->vc_intmsk &= ~(1<<bit_nr);
+}
 
 unsigned int vsbus_irqindex_to_irq(unsigned int irqindex)
 {
@@ -97,7 +131,7 @@
 	}
 
 	info = irqinfo + vsbus_irqindex;
-
+       
 	/* FIXME: need a semaphore here */
 
 	if (info->handler) {

Index: vsbus-ka4x.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/vsbus-ka4x.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vsbus-ka4x.c	6 Aug 2004 22:41:36 -0000	1.2
+++ vsbus-ka4x.c	18 Sep 2004 23:06:33 -0000	1.3
@@ -19,24 +19,25 @@
 
 static int __init vsbus_ka4x_probe(struct device *busdev)
 {
-	/*
-	 * Map the area where we expect to find our device
-	 * interrupt vectors and copy them somewhere more
-	 * convenient
-	 */
+	unsigned int *vectors;
+	int retval;
 
-	unsigned int *rom_vectors;
+        /*
+         * Map the area where we expect to find our device
+         * interrupt vectors so that we can copy them somewhere 
+	 * more convenient
+         */
 
-	rom_vectors = ioremap(0x20040020, 0x20);
-	if (!rom_vectors) {
+	vectors = ioremap(0x20040020, 0x20);
+	if (!vectors) {
 		return -EAGAIN;
 	}
 
-	memcpy(vsbus_rom_vectors, rom_vectors, 0x20);
+	retval = init_vsbus_adapter(vectors, VSA_BASE_REGS);
 
-	iounmap(rom_vectors);
+	iounmap(vectors);
 
-	return 0;
+	return retval;
 }
 
 static struct device_driver vsbus_ka4x_driver = {

[LV-k25-commit] kernel-2.5/drivers Makefile,1.29,1.30

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

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

Modified Files:
	Makefile 
Log Message:
Move all the current VSBUS code into drivers/vax/bus/vsbus.  I'm not
moving the irq auto-probe code since no working driver uses it at the
moment.  I'm very reluctant to resurrect the autoprobe code.  I'm
convinced that we can avoid autoprobing by find out where the interrupt
vector lookup tables are stored on all the newer machines.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile	2 Sep 2004 19:51:18 -0000	1.29
+++ Makefile	18 Sep 2004 23:06:33 -0000	1.30
@@ -54,4 +54,3 @@
 
 # VAX-specific stuff
 obj-$(CONFIG_VAX)		+= vax/
-obj-$(CONFIG_VSBUS)		+= vsbus/

[LV-k25-commit] kernel-2.5/arch/vax defconfig,1.17,1.18

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23924/arch/vax

Modified Files:
	defconfig 
Log Message:
Turn on EMBEDDED so that I can turn off CONFIG_VT.  This "fixes" 
problems with console output.  (The real fix is to do some hard
thinking about the way we register consoles in the DZ and IPRCONS
serial drivers, but I want to get the post-2.6.8 snapshot labeled
for now.)

The framebuffer guys will need to turn on CONFIG_VT themselves.


Index: defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/defconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- defconfig	8 Sep 2004 23:21:16 -0000	1.17
+++ defconfig	15 Sep 2004 21:59:53 -0000	1.18
@@ -11,7 +11,7 @@
 # CONFIG_I2C is not set
 # CONFIG_I2C_ALGOBIT is not set
 # CONFIG_PREEMPT is not set
-CONFIG_CMDLINE="root=/dev/nfs ip=bootp rw debug console=ttyS0"
+CONFIG_CMDLINE="root=/dev/nfs ip=bootp rw debug"
 CONFIG_EARLY_PRINTK=y
 
 #
@@ -48,7 +48,7 @@
 # CONFIG_HOTPLUG is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -112,9 +112,7 @@
 #
 # Character devices
 #
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
+# CONFIG_VT is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -157,12 +155,6 @@
 # Graphics support
 #
 # CONFIG_FB is not set
-
-#
-# Console display driver support
-#
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 
@@ -441,6 +433,16 @@
 # CONFIG_CRYPTO is not set
 
 #
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
 # Sound
 #
 # CONFIG_SOUND is not set

[LV-k25-commit] kernel-2.5/arch/vax Kconfig,1.20,1.21

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23690/arch/vax

Modified Files:
	Kconfig 
Log Message:
Include drivers/media/Kconfig to silence a warning about VIDEO_DEV


Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Kconfig,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Kconfig	17 Aug 2004 22:32:05 -0000	1.20
+++ Kconfig	15 Sep 2004 21:57:05 -0000	1.21
@@ -263,6 +263,7 @@
 
 source "security/Kconfig"
 source "crypto/Kconfig"
+source "drivers/media/Kconfig"
 source "sound/Kconfig"
 source "lib/Kconfig"
 

[LV-k25-commit] kernel-2.5/arch/vax defconfig,1.16,1.17

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9815/arch/vax

Modified Files:
	defconfig 
Log Message:
Refresh defconfig


Index: defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/defconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- defconfig	18 Aug 2004 23:50:23 -0000	1.16
+++ defconfig	8 Sep 2004 23:21:16 -0000	1.17
@@ -34,7 +34,6 @@
 #
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
 CONFIG_BROKEN_ON_SMP=y
 
 #
@@ -52,6 +51,7 @@
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y
@@ -145,12 +145,10 @@
 # CONFIG_GEN_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
 
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_FTAPE is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
@@ -220,6 +218,7 @@
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
 
 #
 # Network testing
@@ -339,7 +338,8 @@
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_FAT_FS is not set
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
 # CONFIG_NTFS_FS is not set
 
 #
@@ -394,7 +394,6 @@
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_LDM_PARTITION is not set
-# CONFIG_NEC98_PARTITION is not set
 # CONFIG_SGI_PARTITION is not set
 CONFIG_ULTRIX_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
@@ -408,6 +407,8 @@
 #
 # Generic Driver Options
 #
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_DEBUG_DRIVER=y
 
 #
@@ -447,5 +448,6 @@
 #
 # Library routines
 #
+# CONFIG_CRC_CCITT is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set

[LV-k25-commit] kernel-2.5/Documentation/vax interrupts.txt,1.3,1.4

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/Documentation/vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30100

Modified Files:
	interrupts.txt 
Log Message:
- Correct chapter title in the VARM (VAX Architecture Reference Manual).
  (By the way, I managed to order the latest release of that book!)


Index: interrupts.txt
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Documentation/vax/interrupts.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- interrupts.txt	20 May 2002 00:33:29 -0000	1.3
+++ interrupts.txt	6 Sep 2004 13:22:22 -0000	1.4
@@ -68,8 +68,6 @@
    clears the stack down as far as the original saved PC and PSL and does
    an REI.
 
-Anyone playing around with this stuff really needs to read the Interrupts
-and Exceptions chapter in the VAX Architecture Reference Manual.
-
+Anyone playing around with this stuff really needs to read the Exceptions
+and Interrupts chapter in the VAX Architecture Reference Manual.
 
-   

[LV-k25-commit] kernel-2.5/drivers/char keyboard.c,1.1.1.23,1.2

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29381

Modified Files:
	keyboard.c 
Log Message:
- Emulate a PCish keyboard on VAXen. This is what basically all other
  archs do.


Index: keyboard.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/keyboard.c,v
retrieving revision 1.1.1.23
retrieving revision 1.2
diff -u -d -r1.1.1.23 -r1.2
--- keyboard.c	2 Sep 2004 19:02:03 -0000	1.1.1.23
+++ keyboard.c	6 Sep 2004 13:19:29 -0000	1.2
@@ -939,7 +939,7 @@
 	tasklet_enable(&keyboard_tasklet);
 }
 
-#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH)
+#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) || defined (CONFIG_VAX)
 
 static unsigned short x86_keycodes[256] =
 	{ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,

[LV-k25-commit] kernel-2.5 Makefile,1.106,1.107

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

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30108

Modified Files:
	Makefile 
Log Message:
Merge Linus' 2.6.8.1 fix for NFS


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- Makefile	2 Sep 2004 19:51:18 -0000	1.106
+++ Makefile	3 Sep 2004 20:44:09 -0000	1.107
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 8
-EXTRAVERSION =
+EXTRAVERSION = .1
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*

[LV-k25-commit] kernel-2.5/fs/nfs file.c,1.1.1.25,1.2

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

Update of /cvsroot/linux-vax/kernel-2.5/fs/nfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30108/fs/nfs

Modified Files:
	file.c 
Log Message:
Merge Linus' 2.6.8.1 fix for NFS


Index: file.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/nfs/file.c,v
retrieving revision 1.1.1.25
retrieving revision 1.2
diff -u -d -r1.1.1.25 -r1.2
--- file.c	2 Sep 2004 18:43:23 -0000	1.1.1.25
+++ file.c	3 Sep 2004 20:44:10 -0000	1.2
@@ -72,7 +72,7 @@
 
 static int nfs_check_flags(int flags)
 {
-	if (flags & (O_APPEND | O_DIRECT))
+	if ((flags & (O_APPEND | O_DIRECT)) == (O_APPEND | O_DIRECT))
 		return -EINVAL;
 
 	return 0;
@@ -89,7 +89,7 @@
 	int res;
 
 	res = nfs_check_flags(filp->f_flags);
-	if (!res)
+	if (res)
 		return res;
 
 	lock_kernel();

[LV-k25-commit] kernel-2.5/include/asm-vax setup.h,NONE,1.1 bitops.h,1.12,1.13 fcntl.h,1.3,1.4 resource.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.sourceforge.net:/tmp/cvs-serv14653/include/asm-vax

Modified Files:
	bitops.h fcntl.h resource.h 
Added Files:
	setup.h 
Log Message:
Add new definitions needed for 2.6.8


Index: fcntl.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/fcntl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fcntl.h	20 May 2002 00:33:39 -0000	1.3
+++ fcntl.h	2 Sep 2004 22:41:50 -0000	1.4
@@ -22,6 +22,7 @@
 #define O_LARGEFILE	0100000
 #define O_DIRECTORY	0200000	/* must be a directory */
 #define O_NOFOLLOW	0400000 /* don't follow links */
+#define O_NOATIME	01000000
 
 #define F_DUPFD		0	/* dup */
 #define F_GETFD		1	/* get f_flags */

Index: resource.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resource.h	20 May 2002 00:33:39 -0000	1.3
+++ resource.h	2 Sep 2004 22:41:50 -0000	1.4
@@ -18,8 +18,10 @@
 #define RLIMIT_MEMLOCK	8		/* max locked-in-memory address space */
 #define RLIMIT_AS	9		/* address space limit */
 #define RLIMIT_LOCKS	10		/* maximum file locks held */
+#define RLIMIT_SIGPENDING 11		/* max number of pending signals */
+#define RLIMIT_MSGQUEUE 12		/* maximum bytes in POSIX mqueues */
 
-#define RLIM_NLIMITS	11
+#define RLIM_NLIMITS	13
 
 /*
  * SuS says limits have to be unsigned.

--- NEW FILE: setup.h ---
#ifndef __VAX_SETUP_H
#define __VAX_SETUP_H

#define COMMAND_LINE_SIZE	256

#endif

Index: bitops.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bitops.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bitops.h	19 Jul 2004 16:22:14 -0000	1.12
+++ bitops.h	2 Sep 2004 22:41:49 -0000	1.13
@@ -454,7 +454,7 @@
  * from the Alpha port...
  */
 static __inline__ unsigned long
-find_next_bit(void *addr, unsigned long size, unsigned long offset)
+find_next_bit(const void *addr, unsigned long size, unsigned long offset)
 {
 	unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
 	unsigned long result = offset & ~31UL;
@@ -491,6 +491,10 @@
 	return result + ffs(tmp);
 }
 
+#define find_first_bit(addr, size) \
+	find_next_bit((addr), (size), 0)
+
+
 #ifdef __KERNEL__
 
 /**

[LV-k25-commit] kernel-2.5/arch/vax/kernel interrupt.c,1.25,1.26

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14370/arch/vax/kernel

Modified Files:
	interrupt.c 
Log Message:
irqaction.mask is now a cpumask_t


Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/interrupt.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- interrupt.c	18 Jul 2004 19:52:37 -0000	1.25
+++ interrupt.c	2 Sep 2004 22:39:39 -0000	1.26
@@ -617,7 +617,7 @@
 
         vector->action.handler = handler;
         vector->action.flags = irqflags;
-        vector->action.mask = 0;
+        vector->action.mask = CPU_MASK_NONE;
         vector->action.name = devname;
         vector->action.next = NULL;
         vector->action.dev_id = dev_id;

[LV-k25-commit] kernel-2.5/arch/vax/kernel setup.c,1.15,1.16

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14104/arch/vax/kernel

Modified Files:
	setup.c 
Log Message:
Some command-line handling is consolidated in arch-independent code
in 2.6.8


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/setup.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- setup.c	31 May 2004 17:27:30 -0000	1.15
+++ setup.c	2 Sep 2004 22:38:46 -0000	1.16
@@ -25,12 +25,11 @@
 #include <asm/page.h>
 #include <asm/mv.h>
 #include <asm/tlbflush.h>
+#include <asm/setup.h>
 
-#define COMMAND_LINE_SIZE 256  
 
 extern char *kernel_cmd_line; 	/* kernel command line from head.S */
-static char command_line[COMMAND_LINE_SIZE];
-char saved_command_line[COMMAND_LINE_SIZE];
+char command_line[COMMAND_LINE_SIZE];
 
 /* Defined in arch/vax/mm/init.c */
 extern void paging_init(void);

[LV-k25-commit] kernel-2.5/arch/vax/mm init.c,1.15,1.16

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/mm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13924/arch/vax/mm

Modified Files:
	init.c 
Log Message:
nr_swap_pages becomes a long in 2.6.8


Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/init.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- init.c	29 Jul 2004 00:28:54 -0000	1.15
+++ init.c	2 Sep 2004 22:37:44 -0000	1.16
@@ -158,7 +158,7 @@
 
 	printk("\nMem-info:\n");
 	show_free_areas();
-	printk("Free swap:       %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
+	printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
 	i = max_mapnr;
 	while (i-- > 0) {
 		total++;

[LV-k25-commit] kernel-2.5/include/linux elf.h,1.22,1.23

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

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010/include/linux

Modified Files:
	elf.h 
Log Message:
Merge with 2.6.8


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- elf.h	28 Jul 2004 22:56:59 -0000	1.22
+++ elf.h	2 Sep 2004 19:51:19 -0000	1.23
@@ -4,6 +4,13 @@
 #include <linux/types.h>
 #include <asm/elf.h>
 
+#ifndef elf_read_implies_exec
+  /* Executables for which elf_read_implies_exec() returns TRUE will
+     have the READ_IMPLIES_EXEC personality flag set automatically.
+     Override in asm/elf.h as needed.  */
+# define elf_read_implies_exec(ex, have_pt_gnu_stack)	0
+#endif
+
 /* 32-bit ELF base types. */
 typedef __u32	Elf32_Addr;
 typedef __u16	Elf32_Half;

[LV-k25-commit] kernel-2.5/drivers Makefile,1.28,1.29

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.6.8


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile	12 Jul 2004 23:19:46 -0000	1.28
+++ Makefile	2 Sep 2004 19:51:18 -0000	1.29
@@ -42,6 +42,7 @@
 obj-$(CONFIG_SERIO)		+= input/serio/
 obj-$(CONFIG_I2O)		+= message/
 obj-$(CONFIG_I2C)		+= i2c/
+obj-$(CONFIG_W1)		+= w1/
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/

[LV-k25-commit] kernel-2.5/drivers/char Makefile,1.42,1.43

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010/drivers/char

Modified Files:
	Makefile 
Log Message:
Merge with 2.6.8


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile	28 Jul 2004 23:51:44 -0000	1.42
+++ Makefile	2 Sep 2004 19:51:18 -0000	1.43
@@ -41,21 +41,23 @@
 obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
 obj-$(CONFIG_HVC_CONSOLE)	+= hvc_console.o
 obj-$(CONFIG_RAW_DRIVER)	+= raw.o
-obj-$(CONFIG_SGI_L1_SERIAL)	+= sn_serial.o
 obj-$(CONFIG_VIOCONS) += viocons.o
 obj-$(CONFIG_VIOTAPE)		+= viotape.o
+obj-$(CONFIG_HVCS)		+= hvcs.o
 
 obj-$(CONFIG_PRINTER) += lp.o
 obj-$(CONFIG_TIPAR) += tipar.o
-obj-$(CONFIG_PC9800_OLDLP) += lp_old98.o
 
 obj-$(CONFIG_DTLK) += dtlk.o
 obj-$(CONFIG_R3964) += n_r3964.o
 obj-$(CONFIG_APPLICOM) += applicom.o
 obj-$(CONFIG_SONYPI) += sonypi.o
 obj-$(CONFIG_RTC) += rtc.o
+obj-$(CONFIG_HPET) += hpet.o
 obj-$(CONFIG_GEN_RTC) += genrtc.o
 obj-$(CONFIG_EFI_RTC) += efirtc.o
+obj-$(CONFIG_SGI_DS1286) += ds1286.o
+obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
   obj-$(CONFIG_NVRAM) += generic_nvram.o
 else
@@ -67,7 +69,7 @@
 obj-$(CONFIG_HW_RANDOM) += hw_random.o
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
 obj-$(CONFIG_FTAPE) += ftape/
-obj-$(CONFIG_H8) += h8.o
+obj-$(CONFIG_COBALT_LCD) += lcd.o
 obj-$(CONFIG_PPDEV) += ppdev.o
 obj-$(CONFIG_DZ) += dz.o
 obj-$(CONFIG_NWBUTTON) += nwbutton.o

[LV-k25-commit] kernel-2.5 Makefile,1.105,1.106

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

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010

Modified Files:
	Makefile 
Log Message:
Merge with 2.6.8


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- Makefile	6 Aug 2004 23:37:57 -0000	1.105
+++ Makefile	2 Sep 2004 19:51:18 -0000	1.106
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 7
+SUBLEVEL = 8
 EXTRAVERSION =
 NAME=Zonked Quokka
 
@@ -53,7 +53,7 @@
   KBUILD_CHECKSRC = 0
 endif
 
-# Use make M=dir to specify direcotry of external module to build
+# Use make M=dir to specify directory of external module to build
 # Old syntax make ... SUBDIRS=$PWD is still supported
 # Setting the environment variable KBUILD_EXTMOD take precedence
 ifdef SUBDIRS
@@ -130,16 +130,6 @@
 _all: modules
 endif
 
-# Make sure we're not wasting cpu-cycles doing locale handling, yet do make
-# sure error messages appear in the user-desired language
-ifdef LC_ALL
-LANG := $(LC_ALL)
-LC_ALL :=
-endif
-LC_COLLATE := C
-LC_CTYPE := C
-export LANG LC_ALL LC_COLLATE LC_CTYPE
-
 srctree		:= $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
 TOPDIR		:= $(srctree)
 # FIXME - TOPDIR is obsolete, use srctree/objtree
@@ -290,8 +280,6 @@
 OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
 AWK		= awk
-RPM 		:= $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
-		    	else echo rpm; fi)
 GENKSYMS	= scripts/genksyms/genksyms
 DEPMOD		= /sbin/depmod
 KALLSYMS	= scripts/kallsyms
@@ -334,8 +322,8 @@
 
 # Files to ignore in find ... statements
 
-RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \) -prune -o
-RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS
+RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc \) -prune -o
+RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc
 
 # ===========================================================================
 # Rules shared between *config targets and build targets
@@ -409,13 +397,6 @@
 
 scripts_basic: include/linux/autoconf.h
 
-
-# That's our default target when none is given on the command line
-# Note that 'modules' will be added as a prerequisite as well, 
-# in the CONFIG_MODULES part below
-
-all:	vmlinux
-
 # Objects we will link into vmlinux / subdirs we need to visit
 init-y		:= init/
 drivers-y	:= drivers/ sound/
@@ -449,6 +430,19 @@
 
 include $(srctree)/arch/$(ARCH)/Makefile
 
+# Default kernel image to build when no specific target is given.
+# KBUILD_IMAGE may be overruled on the commandline or
+# set in the environment
+# Also any assingments in arch/$(ARCH)/Makefiel take precedence over
+# this default value
+export KBUILD_IMAGE ?= vmlinux
+
+# The all: target is the default when no target is given on the
+# command line.
+# This allow a user to issue only 'make' to build a kernel including modules
+# Defaults vmlinux but it is usually overriden in the arch makefile
+all: vmlinux
+
 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
 CFLAGS		+= -Os
 else
@@ -544,10 +538,7 @@
 	echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
 endef
 
-define rule_vmlinux
-	$(rule_vmlinux__); \
-	$(NM) $@ | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
-endef
+do_system_map = $(NM) $(1) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > $(2)
 
 LDFLAGS_vmlinux += -T arch/$(ARCH)/kernel/vmlinux.lds.s
 
@@ -561,30 +552,57 @@
 #	  but due to the added section, some addresses have shifted
 #	  From here, we generate a correct .tmp_kallsyms2.o
 #	o The correct .tmp_kallsyms2.o is linked into the final vmlinux.
+#	o Verify that the System.map from vmlinux matches the map from
+#	  .tmp_vmlinux2, just in case we did not generate kallsyms correctly.
+#	o If CONFIG_KALLSYMS_EXTRA_PASS is set, do an extra pass using
+#	  .tmp_vmlinux3 and .tmp_kallsyms3.o.  This is only meant as a
+#	  temporary bypass to allow the kernel to be built while the
+#	  maintainers work out what went wrong with kallsyms.
 
 ifdef CONFIG_KALLSYMS
 
-kallsyms.o := .tmp_kallsyms2.o
+ifdef CONFIG_KALLSYMS_EXTRA_PASS
+last_kallsyms := 3
+else
+last_kallsyms := 2
+endif
+
+kallsyms.o := .tmp_kallsyms$(last_kallsyms).o
+
+define rule_verify_kallsyms
+	@$(call do_system_map, .tmp_vmlinux$(last_kallsyms), .tmp_System.map)
+	@cmp -s System.map .tmp_System.map || \
+		(echo Inconsistent kallsyms data, try setting CONFIG_KALLSYMS_EXTRA_PASS ; rm .tmp_kallsyms* ; false)
+endef
 
 quiet_cmd_kallsyms = KSYM    $@
 cmd_kallsyms = $(NM) -n $< | $(KALLSYMS) $(foreach x,$(CONFIG_KALLSYMS_ALL),--all-symbols) > $@
 
-.tmp_kallsyms1.o .tmp_kallsyms2.o: %.o: %.S scripts FORCE
+.tmp_kallsyms1.o .tmp_kallsyms2.o .tmp_kallsyms3.o: %.o: %.S scripts FORCE
 	$(call if_changed_dep,as_o_S)
 
 .tmp_kallsyms%.S: .tmp_vmlinux%
 	$(call cmd,kallsyms)
 
 .tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
-	+$(call if_changed_rule,vmlinux__)
+	$(call if_changed_rule,vmlinux__)
 
 .tmp_vmlinux2: $(vmlinux-objs) .tmp_kallsyms1.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
 	$(call if_changed_rule,vmlinux__)
 
+.tmp_vmlinux3: $(vmlinux-objs) .tmp_kallsyms2.o arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
+	$(call if_changed_rule,vmlinux__)
+
 endif
 
 #	Finally the vmlinux rule
 
+define rule_vmlinux
+	$(rule_vmlinux__); \
+	$(call do_system_map, $@, System.map)
+	$(rule_verify_kallsyms)
+endef
+
 vmlinux: $(vmlinux-objs) $(kallsyms.o) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
 	$(call if_changed_rule,vmlinux)
 
@@ -593,7 +611,11 @@
 
 $(sort $(vmlinux-objs)) arch/$(ARCH)/kernel/vmlinux.lds.s: $(vmlinux-dirs) ;
 
-# 	Handle descending into subdirectories listed in $(vmlinux-dirs)
+# Handle descending into subdirectories listed in $(vmlinux-dirs)
+# Preset locale variables to speed up the build process. Limit locale
+# tweaks to this spot to avoid wrong language settings when running
+# make menuconfig etc.
+# Error messages still appears in the original language
 
 .PHONY: $(vmlinux-dirs)
 $(vmlinux-dirs): prepare-all scripts
@@ -604,14 +626,24 @@
 # A multi level approach is used. prepare1 is updated first, then prepare0.
 # prepare-all is the collection point for the prepare targets.
 
-.PHONY: prepare-all prepare prepare0 prepare1
+.PHONY: prepare-all prepare prepare0 prepare1 prepare2
+
+# prepare 2 generate Makefile to be placed in output directory, if
+# using a seperate output directory. This allows convinient use
+# of make in output directory
+prepare2:
+	$(Q)if [ ! $(srctree) -ef $(objtree) ]; then       \
+	$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile      \
+	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) \
+	    > $(objtree)/Makefile;                         \
+	fi
 
 # prepare1 is used to check if we are building in a separate output directory,
 # and if so do:
 # 1) Check that make has not been executed in the kernel src $(srctree)
 # 2) Create the include2 directory, used for the second asm symlink
 
-prepare1:
+prepare1: prepare2
 ifneq ($(KBUILD_SRC),)
 	@echo '  Using $(srctree) as source for kernel'
 	$(Q)if [ -h $(srctree)/include/asm -o -f $(srctree)/.config ]; then \
@@ -732,9 +764,13 @@
 		sleep 1; \
 	fi
 	@rm -rf $(MODLIB)/kernel
-	@rm -f $(MODLIB)/build
+	@rm -f $(MODLIB)/source
 	@mkdir -p $(MODLIB)/kernel
-	@ln -s $(TOPDIR) $(MODLIB)/build
+	@ln -s $(srctree) $(MODLIB)/source
+	@if [ ! $(objtree) -ef  $(MODLIB)/build ]; then \
+		rm -f $(MODLIB)/build ; \
+		ln -s $(objtree) $(MODLIB)/build ; \
+	fi
 	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst
 
 # If System.map exists, run depmod.  This deliberately does not have a
@@ -795,8 +831,8 @@
 
 # Directories & files removed with 'make clean'
 CLEAN_DIRS  += $(MODVERDIR)
-CLEAN_FILES +=	vmlinux System.map kernel.spec \
-                .tmp_kallsyms* .tmp_version .tmp_vmlinux*
+CLEAN_FILES +=	vmlinux System.map \
+                .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config include2
@@ -842,44 +878,26 @@
 .PHONY: distclean
 
 distclean: mrproper
-	@find . $(RCS_FIND_IGNORE) \
+	@find $(srctree) $(RCS_FIND_IGNORE) \
 	 	\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 	 	-o -name '.*.rej' -o -size 0 \
 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
 		-type f -print | xargs rm -f
 
-# RPM target
-# ---------------------------------------------------------------------------
-
-.PHONY: rpm
-
-# Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH=kernel-$(subst -,,$(KERNELRELEASE))
-
-#	If you do a make spec before packing the tarball you can rpm -ta it
-
-spec:
-	$(CONFIG_SHELL) $(srctree)/scripts/mkspec > $(objtree)/kernel.spec
 
-#	a) Build a tar ball
-#	b) generate an rpm from it
-#	c) and pack the result
-#	- Use /. to avoid tar packing just the symlink
+# Packaging of the kernel to various formats
+# ---------------------------------------------------------------------------
+# rpm target kept for backward compatibility
+package-dir	:= $(srctree)/scripts/package
 
-rpm:	clean spec
-	set -e; \
-	cd .. ; \
-	ln -sf $(srctree) $(KERNELPATH) ; \
-	tar -cvz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
-	rm $(KERNELPATH)
+.PHONY: %-pkg rpm
 
-	set -e; \
-	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\
-	mv -f $(objtree)/.tmp_version $(objtree)/.version;
+%pkg: FORCE
+	$(Q)$(MAKE) -f $(package-dir)/Makefile $@
+rpm: FORCE
+	$(Q)$(MAKE) -f $(package-dir)/Makefile $@
 
-	$(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
-	rm ../$(KERNELPATH).tar.gz
 
 # Brief documentation of the typical targets used
 # ---------------------------------------------------------------------------
@@ -906,6 +924,8 @@
 	@echo  '  tags/TAGS	  - Generate tags file for editors'
 	@echo  '  cscope	  - Generate cscope index'
 	@echo  '  checkstack      - Generate a list of stack hogs'
+	@echo  'Kernel packaging:'
+	@$(MAKE) -f $(package-dir)/Makefile help
 	@echo  ''
 	@echo  'Documentation targets:'
 	@$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
@@ -998,19 +1018,19 @@
 # ---------------------------------------------------------------------------
 
 define all-sources
-	( find . $(RCS_FIND_IGNORE) \
+	( find $(srctree) $(RCS_FIND_IGNORE) \
 	       \( -name include -o -name arch \) -prune -o \
 	       -name '*.[chS]' -print; \
-	  find arch/$(ARCH) $(RCS_FIND_IGNORE) \
+	  find $(srctree)/arch/$(ARCH) $(RCS_FIND_IGNORE) \
 	       -name '*.[chS]' -print; \
-	  find security/selinux/include $(RCS_FIND_IGNORE) \
+	  find $(srctree)/security/selinux/include $(RCS_FIND_IGNORE) \
 	       -name '*.[chS]' -print; \
-	  find include $(RCS_FIND_IGNORE) \
+	  find $(srctree)/include $(RCS_FIND_IGNORE) \
 	       \( -name config -o -name 'asm-*' \) -prune \
 	       -o -name '*.[chS]' -print; \
-	  find include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
+	  find $(srctree)/include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
 	       -name '*.[chS]' -print; \
-	  find include/asm-generic $(RCS_FIND_IGNORE) \
+	  find $(srctree)/include/asm-generic $(RCS_FIND_IGNORE) \
 	       -name '*.[chS]' -print )
 endef
 
@@ -1071,7 +1091,7 @@
 .PHONY: checkstack
 checkstack:
 	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
-	$(PERL) scripts/checkstack.pl $(ARCH)
+	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)
 
 # FIXME Should go into a make.lib or something 
 # ===========================================================================

[LV-k25-commit] kernel-2.5/drivers/video/console Kconfig,1.2,1.3

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/console
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010/drivers/video/console

Modified Files:
	Kconfig 
Log Message:
Merge with 2.6.8


Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/console/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	16 Aug 2004 12:46:10 -0000	1.2
+++ Kconfig	2 Sep 2004 19:51:19 -0000	1.3
@@ -106,11 +106,6 @@
 	tristate "Framebuffer Console support"
 	depends on FB
 
-config PCI_CONSOLE
-	bool
-	depends on FRAMEBUFFER_CONSOLE
-	default y
-
 config FONTS
 	bool "Select compiled-in fonts"
 	depends on FRAMEBUFFER_CONSOLE

[LV-k25-commit] kernel-2.5/drivers/video Kconfig,1.10,1.11 Makefile,1.7,1.8 fbmem.c,1.7,1.8

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010/drivers/video

Modified Files:
	Kconfig Makefile fbmem.c 
Log Message:
Merge with 2.6.8


Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/fbmem.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fbmem.c	28 Jul 2004 22:49:19 -0000	1.7
+++ fbmem.c	2 Sep 2004 19:51:19 -0000	1.8
@@ -73,8 +73,8 @@
 extern int cyber2000fb_setup(char*);
 extern int retz3fb_init(void);
 extern int retz3fb_setup(char*);
-extern int clgenfb_init(void);
-extern int clgenfb_setup(char*);
+extern int cirrusfb_init(void);
+extern int cirrusfb_setup(char*);
 extern int hitfb_init(void);
 extern int vfb_init(void);
 extern int vfb_setup(char*);
@@ -174,6 +174,7 @@
 extern int vaxlcgfb_setup(char*);
 extern int mc68x328fb_init(void);
 extern int mc68x328fb_setup(char *);
+extern int asiliantfb_init(void);
 
 static struct {
 	const char *name;
@@ -205,8 +206,8 @@
 #ifdef CONFIG_FB_PM3
 	{ "pm3fb", pm3fb_init, pm3fb_setup },
 #endif           
-#ifdef CONFIG_FB_CLGEN
-	{ "clgenfb", clgenfb_init, clgenfb_setup },
+#ifdef CONFIG_FB_CIRRUS
+	{ "cirrusfb", cirrusfb_init, cirrusfb_setup },
 #endif
 #ifdef CONFIG_FB_ATY
 	{ "atyfb", atyfb_init, atyfb_setup },
@@ -390,6 +391,9 @@
 #ifdef CONFIG_FB_68328
 	{ "68328fb", mc68x328fb_init, mc68x328fb_setup },
 #endif
+#ifdef CONFIG_FB_ASILIANT
+	{ "asiliantfb", asiliantfb_init, NULL },
+#endif
 
 	/*
 	 * Generic drivers that don't use resource management (yet)
@@ -431,34 +435,37 @@
 /*
  * Drawing helpers.
  */
-static u8 fb_sys_inbuf(struct fb_info *info, u8 *src)
+void fb_iomove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
+			   u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
+			   u32 height)
 {
-	return *src;
-}
+	int i;
 
-static void fb_sys_outbuf(struct fb_info *info, u8 *dst,
-				u8 *src, unsigned int size)
-{
-	memcpy(dst, src, size);
-}	
+	for (i = height; i--; ) {
+		buf->outbuf(info, dst, src, s_pitch);
+		src += s_pitch;
+		dst += d_pitch;
+	}
+}
 
-void fb_move_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
-			u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
-			u32 height)
+void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
+			    u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
+			    u32 height)
 {
-	int i;
+	int i, j;
 
 	for (i = height; i--; ) {
-		buf->outbuf(info, dst, src, s_pitch);
+		for (j = 0; j < s_pitch; j++)
+			dst[j] = src[j];
 		src += s_pitch;
 		dst += d_pitch;
 	}
 }
 
-void fb_move_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
-			u8 *dst, u32 d_pitch, u8 *src, u32 idx,
-			u32 height, u32 shift_high, u32 shift_low,
-			u32 mod)
+void fb_iomove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
+			     u8 *dst, u32 d_pitch, u8 *src, u32 idx,
+			     u32 height, u32 shift_high, u32 shift_low,
+			     u32 mod)
 {
 	u8 mask = (u8) (0xfff << shift_high), tmp;
 	int i, j;
@@ -486,6 +493,37 @@
 	}
 }
 
+void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
+			      u8 *dst, u32 d_pitch, u8 *src, u32 idx,
+			      u32 height, u32 shift_high, u32 shift_low,
+			      u32 mod)
+{
+	u8 mask = (u8) (0xfff << shift_high), tmp;
+	int i, j;
+
+	for (i = height; i--; ) {
+		for (j = 0; j < idx; j++) {
+			tmp = dst[j];
+			tmp &= mask;
+			tmp |= *src >> shift_low;
+			dst[j] = tmp;
+			tmp = *src << shift_high;
+			dst[j+1] = tmp;
+			src++;
+		}
+		tmp = dst[idx];
+		tmp &= mask;
+		tmp |= *src >> shift_low;
+		dst[idx] = tmp;
+		if (shift_high < mod) {
+			tmp = *src << shift_high;
+			dst[idx+1] = tmp;
+		}
+		src++;
+		dst += d_pitch;
+	}
+}
+
 /*
  * we need to lock this section since fb_cursor
  * may use fb_imageblit()
@@ -530,7 +568,7 @@
 	return n < 0 ? d >> -n : d << n;
 }
 
-static void __init fb_set_logocmap(struct fb_info *info,
+static void fb_set_logocmap(struct fb_info *info,
 				   const struct linux_logo *logo)
 {
 	struct fb_cmap palette_cmap;
@@ -560,11 +598,11 @@
 			palette_cmap.blue[j] = clut[2] << 8 | clut[2];
 			clut += 3;
 		}
-		fb_set_cmap(&palette_cmap, 1, info);
+		fb_set_cmap(&palette_cmap, info);
 	}
 }
 
-static void  __init fb_set_logo_truepalette(struct fb_info *info,
+static void  fb_set_logo_truepalette(struct fb_info *info,
 					    const struct linux_logo *logo,
 					    u32 *palette)
 {
@@ -594,7 +632,7 @@
 	}
 }
 
-static void __init fb_set_logo_directpalette(struct fb_info *info,
+static void fb_set_logo_directpalette(struct fb_info *info,
 					     const struct linux_logo *logo,
 					     u32 *palette)
 {
@@ -609,7 +647,7 @@
 		palette[i] = i << redshift | i << greenshift | i << blueshift;
 }
 
-static void __init fb_set_logo(struct fb_info *info,
+static void fb_set_logo(struct fb_info *info,
 			       const struct linux_logo *logo, u8 *dst,
 			       int depth)
 {
@@ -808,7 +846,7 @@
 }
 
 static ssize_t
-fb_read(struct file *file, char *buf, size_t count, loff_t *ppos)
+fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
 	unsigned long p = *ppos;
 	struct inode *inode = file->f_dentry->d_inode;
@@ -845,7 +883,7 @@
 }
 
 static ssize_t
-fb_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 {
 	unsigned long p = *ppos;
 	struct inode *inode = file->f_dentry->d_inode;
@@ -899,53 +937,100 @@
 	unsigned int width = (info->cursor.image.width + 7) >> 3;
 	u8 *data = (u8 *) info->cursor.image.data;
 
-	info->sprite.outbuf(info, info->sprite.addr, data, width);
+	if (info->sprite.outbuf)
+	    info->sprite.outbuf(info, info->sprite.addr, data, width);
+	else
+	    memcpy(info->sprite.addr, data, width);
 }
 
 int
-fb_cursor(struct fb_info *info, struct fb_cursor *sprite)
+fb_cursor(struct fb_info *info, struct fb_cursor_user __user *sprite)
 {
+	struct fb_cursor_user cursor_user;
 	struct fb_cursor cursor;
-	int err;
+	char *data = NULL, *mask = NULL;
+	u16 *red = NULL, *green = NULL, *blue = NULL, *transp = NULL;
+	int err = -EINVAL;
 	
-	if (copy_from_user(&cursor, sprite, sizeof(struct fb_cursor)))
+	if (copy_from_user(&cursor_user, sprite, sizeof(struct fb_cursor_user)))
 		return -EFAULT;
 
+	memcpy(&cursor, &cursor_user, sizeof(cursor));
+	cursor.mask = NULL;
+	cursor.image.data = NULL;
+	cursor.image.cmap.red = NULL;
+	cursor.image.cmap.green = NULL;
+	cursor.image.cmap.blue = NULL;
+	cursor.image.cmap.transp = NULL;
+
 	if (cursor.set & FB_CUR_SETCUR)
 		info->cursor.enable = 1;
 	
 	if (cursor.set & FB_CUR_SETCMAP) {
-		err = fb_copy_cmap(&cursor.image.cmap, &sprite->image.cmap, 1);
-		if (err)
-			return err;
+		unsigned len = cursor.image.cmap.len;
+		if ((int)len <= 0)
+			goto out;
+		len *= 2;
+		err = -ENOMEM;
+		red = kmalloc(len, GFP_USER);
+		green = kmalloc(len, GFP_USER);
+		blue = kmalloc(len, GFP_USER);
+		if (!red || !green || !blue)
+			goto out;
+		if (cursor_user.image.cmap.transp) {
+			transp = kmalloc(len, GFP_USER);
+			if (!transp)
+				goto out;
+		}
+		err = -EFAULT;
+		if (copy_from_user(red, cursor_user.image.cmap.red, len))
+			goto out;
+		if (copy_from_user(green, cursor_user.image.cmap.green, len))
+			goto out;
+		if (copy_from_user(blue, cursor_user.image.cmap.blue, len))
+			goto out;
+		if (transp) {
+			if (copy_from_user(transp,
+					   cursor_user.image.cmap.transp, len))
+				goto out;
+		}
+		cursor.image.cmap.red = red;
+		cursor.image.cmap.green = green;
+		cursor.image.cmap.blue = blue;
+		cursor.image.cmap.transp = transp;
 	}
 	
 	if (cursor.set & FB_CUR_SETSHAPE) {
 		int size = ((cursor.image.width + 7) >> 3) * cursor.image.height;		
+
 		if ((cursor.image.height != info->cursor.image.height) ||
 		    (cursor.image.width != info->cursor.image.width))
 			cursor.set |= FB_CUR_SETSIZE;
 		
-		cursor.image.data = kmalloc(size, GFP_KERNEL);
-		if (!cursor.image.data)
-			return -ENOMEM;
+		err = -ENOMEM;
+		data = kmalloc(size, GFP_USER);
+		mask = kmalloc(size, GFP_USER);
+		if (!mask || !data)
+			goto out;
 		
-		cursor.mask = kmalloc(size, GFP_KERNEL);
-		if (!cursor.mask) {
-			kfree(cursor.image.data);
-			return -ENOMEM;
-		}
+		err = -EFAULT;
+		if (copy_from_user(data, cursor_user.image.data, size) ||
+		    copy_from_user(mask, cursor_user.mask, size))
+			goto out;
 		
-		if (copy_from_user(cursor.image.data, sprite->image.data, size) ||
-		    copy_from_user(cursor.mask, sprite->mask, size)) { 
-			kfree(cursor.image.data);
-			kfree(cursor.mask);
-			return -EFAULT;
-		}
+		cursor.image.data = data;
+		cursor.mask = mask;
 	}
 	info->cursor.set = cursor.set;
 	info->cursor.rop = cursor.rop;
 	err = info->fbops->fb_cursor(info, &cursor);
+out:
+	kfree(data);
+	kfree(mask);
+	kfree(red);
+	kfree(green);
+	kfree(blue);
+	kfree(transp);
 	return err;
 }
 
@@ -994,9 +1079,13 @@
 
 			fb_pan_display(info, &info->var);
 
-			fb_set_cmap(&info->cmap, 1, info);
+			fb_set_cmap(&info->cmap, info);
 
-			notifier_call_chain(&fb_notifier_list, FB_EVENT_MODE_CHANGE, info);
+			if (info->flags & FBINFO_MISC_MODECHANGEUSER) {
+				info->flags &= ~FBINFO_MISC_MODECHANGEUSER;
+				notifier_call_chain(&fb_notifier_list,
+						    FB_EVENT_MODE_CHANGE, info);
+			}
 		}
 	}
 	return 0;
@@ -1019,7 +1108,7 @@
 		cmap.len = info->cmap.len;
 	} else
 		cmap = info->cmap;
-	return fb_set_cmap(&cmap, 1, info);
+	return fb_set_cmap(&cmap, info);
 }
 
 static int 
@@ -1034,63 +1123,66 @@
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
 	struct fb_con2fbmap con2fb;
 #endif
-	struct fb_cmap cmap;
+	struct fb_cmap_user cmap;
+	void __user *argp = (void __user *)arg;
 	int i;
 	
 	if (!fb)
 		return -ENODEV;
 	switch (cmd) {
 	case FBIOGET_VSCREENINFO:
-		return copy_to_user((void *) arg, &info->var,
+		return copy_to_user(argp, &info->var,
 				    sizeof(var)) ? -EFAULT : 0;
 	case FBIOPUT_VSCREENINFO:
-		if (copy_from_user(&var, (void *) arg, sizeof(var)))
+		if (copy_from_user(&var, argp, sizeof(var)))
 			return -EFAULT;
 		acquire_console_sem();
+		info->flags |= FBINFO_MISC_MODECHANGEUSER;
 		i = fb_set_var(info, &var);
+		info->flags &= ~FBINFO_MISC_MODECHANGEUSER;
 		release_console_sem();
 		if (i) return i;
-		if (copy_to_user((void *) arg, &var, sizeof(var)))
+		if (copy_to_user(argp, &var, sizeof(var)))
 			return -EFAULT;
 		return 0;
 	case FBIOGET_FSCREENINFO:
-		return copy_to_user((void *) arg, &info->fix,
+		return copy_to_user(argp, &info->fix,
 				    sizeof(fix)) ? -EFAULT : 0;
 	case FBIOPUTCMAP:
-		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
+		if (copy_from_user(&cmap, argp, sizeof(cmap)))
 			return -EFAULT;
-		return (fb_set_cmap(&cmap, 0, info));
+		return (fb_set_user_cmap(&cmap, info));
 	case FBIOGETCMAP:
-		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
+		if (copy_from_user(&cmap, argp, sizeof(cmap)))
 			return -EFAULT;
-		return (fb_copy_cmap(&info->cmap, &cmap, 2));
+		return fb_cmap_to_user(&info->cmap, &cmap);
 	case FBIOPAN_DISPLAY:
-		if (copy_from_user(&var, (void *) arg, sizeof(var)))
+		if (copy_from_user(&var, argp, sizeof(var)))
 			return -EFAULT;
 		acquire_console_sem();
 		i = fb_pan_display(info, &var);
 		release_console_sem();
 		if (i)
 			return i;
-		if (copy_to_user((void *) arg, &var, sizeof(var)))
+		if (copy_to_user(argp, &var, sizeof(var)))
 			return -EFAULT;
 		return 0;
 	case FBIO_CURSOR:
 		acquire_console_sem();
-		i = fb_cursor(info, (struct fb_cursor *) arg);
+		i = fb_cursor(info, argp);
 		release_console_sem();
 		return i;
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
 	case FBIOGET_CON2FBMAP:
-		if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb)))
+		if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
 			return -EFAULT;
 		if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
 		    return -EINVAL;
 		con2fb.framebuffer = con2fb_map[con2fb.console-1];
-		return copy_to_user((void *)arg, &con2fb,
+		return copy_to_user(argp, &con2fb,
 				    sizeof(con2fb)) ? -EFAULT : 0;
 	case FBIOPUT_CON2FBMAP:
-		if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb)))
+		if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
 			return - EFAULT;
 		if (con2fb.console < 0 || con2fb.console > MAX_NR_CONSOLES)
 		    return -EINVAL;
@@ -1102,11 +1194,10 @@
 #endif /* CONFIG_KMOD */
 		if (!registered_fb[con2fb.framebuffer])
 		    return -EINVAL;
-		if (con2fb.console != 0)
-			set_con2fb_map(con2fb.console-1, con2fb.framebuffer);
-		else
-			fb_console_init();		
-		return 0;
+		if (con2fb.console > 0 && con2fb.console < MAX_NR_CONSOLES)
+			return set_con2fb_map(con2fb.console-1,
+					      con2fb.framebuffer);
+		return -EINVAL;
 #endif	/* CONFIG_FRAMEBUFFER_CONSOLE */
 	case FBIOBLANK:
 		acquire_console_sem();
@@ -1312,10 +1403,6 @@
 		}
 	}	
 	fb_info->pixmap.offset = 0;
-	if (fb_info->pixmap.outbuf == NULL)
-		fb_info->pixmap.outbuf = fb_sys_outbuf;
-	if (fb_info->pixmap.inbuf == NULL)
-		fb_info->pixmap.inbuf = fb_sys_inbuf;
 
 	if (fb_info->sprite.addr == NULL) {
 		fb_info->sprite.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
@@ -1328,10 +1415,6 @@
 		}
 	}
 	fb_info->sprite.offset = 0;
-	if (fb_info->sprite.outbuf == NULL)
-		fb_info->sprite.outbuf = fb_sys_outbuf;
-	if (fb_info->sprite.inbuf == NULL)
-		fb_info->sprite.inbuf = fb_sys_inbuf;
 
 	registered_fb[i] = fb_info;
 
@@ -1423,7 +1506,7 @@
 {
 	int i;
 
-	create_proc_read_entry("fb", 0, 0, fbmem_read_proc, NULL);
+	create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL);
 
 	devfs_mk_dir("fb");
 	if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
@@ -1526,8 +1609,10 @@
 EXPORT_SYMBOL(fb_blank);
 EXPORT_SYMBOL(fb_pan_display);
 EXPORT_SYMBOL(fb_get_buffer_offset);
-EXPORT_SYMBOL(fb_move_buf_unaligned);
-EXPORT_SYMBOL(fb_move_buf_aligned);
+EXPORT_SYMBOL(fb_iomove_buf_unaligned);
+EXPORT_SYMBOL(fb_iomove_buf_aligned);
+EXPORT_SYMBOL(fb_sysmove_buf_unaligned);
+EXPORT_SYMBOL(fb_sysmove_buf_aligned);
 EXPORT_SYMBOL(fb_load_cursor_image);
 EXPORT_SYMBOL(fb_set_suspend);
 EXPORT_SYMBOL(fb_register_client);

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	28 Jul 2004 22:49:19 -0000	1.7
+++ Makefile	2 Sep 2004 19:51:19 -0000	1.8
@@ -39,7 +39,7 @@
 obj-$(CONFIG_FB_OF)               += offb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o
 obj-$(CONFIG_FB_IMSTT)            += imsttfb.o cfbimgblt.o
 obj-$(CONFIG_FB_RETINAZ3)         += retz3fb.o
-obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o
+obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o
 obj-$(CONFIG_FB_TRIDENT)	  += tridentfb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o
 obj-$(CONFIG_FB_S3TRIO)           += S3triofb.o
 obj-$(CONFIG_FB_TGA)              += tgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 

Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/Kconfig,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Kconfig	28 Jul 2004 22:49:19 -0000	1.10
+++ Kconfig	2 Sep 2004 19:51:19 -0000	1.11
@@ -40,7 +40,7 @@
 
 config FB_CIRRUS
 	tristate "Cirrus Logic support"
-	depends on FB && (AMIGA || PCI) && BROKEN
+	depends on FB && (ZORRO || PCI)
 	---help---
 	  This enables support for Cirrus Logic GD542x/543x based boards on
 	  Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
@@ -93,7 +93,7 @@
 
 config FB_CYBER2000
 	tristate "CyberPro 2000/2010/5000 support"
-	depends on FB && PCI
+	depends on FB && PCI && (BROKEN || !SPARC64)
 	help
 	  This enables support for the Integraphics CyberPro 20x0 and 5000
 	  VGA chips used in the Rebel.com Netwinder and other machines.
@@ -238,7 +238,7 @@
 
 config FB_S3TRIO
 	bool "S3 Trio display support"
-	depends on FB && PPC
+	depends on FB && PPC && BROKEN
 	help
 	  If you have a S3 Trio say Y. Say N for S3 Virge.
 
@@ -431,6 +431,8 @@
 config FB_RIVA
 	tristate "nVidia Riva support"
 	depends on FB && PCI
+	select I2C_ALGOBIT if FB_RIVA_I2C
+	select I2C if FB_RIVA_I2C
 	help
 	  This driver supports graphics boards with the nVidia Riva/Geforce
 	  chips.
@@ -439,6 +441,27 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called rivafb.
 
+config FB_RIVA_I2C
+       bool "Enable DDC Support"
+       depends on FB_RIVA
+       help
+	  This enables I2C support for nVidia Chipsets.  This is used
+	  only for getting EDID information from the attached display
+	  allowing for robust video mode handling and switching.
+
+	  Because fbdev-2.6 requires that drivers must be able to
+	  independently validate video mode parameters, you should say Y
+	  here.
+
+config FB_RIVA_DEBUG
+	bool "Lots of debug output from Riva(nVidia) driver"
+	depends on FB_RIVA
+	default n
+	help
+	  Say Y here if you want the Riva driver to output all sorts
+	  of debugging informations to provide to the maintainer when
+	  something goes wrong.
+
 config FB_I810
 	tristate "Intel 810/815 support (EXPERIMENTAL)"
 	depends on FB && AGP && AGP_INTEL && EXPERIMENTAL && PCI	

[LV-k25-commit] kernel-2.5/drivers/scsi Makefile,1.36,1.37 NCR5380.c,1.5,1.6

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010/drivers/scsi

Modified Files:
	Makefile NCR5380.c 
Log Message:
Merge with 2.6.8


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile	8 Aug 2004 23:35:02 -0000	1.36
+++ Makefile	2 Sep 2004 19:51:18 -0000	1.37
@@ -34,7 +34,6 @@
 obj-$(CONFIG_A3000_SCSI)	+= a3000.o	wd33c93.o
 obj-$(CONFIG_A2091_SCSI)	+= a2091.o	wd33c93.o
 obj-$(CONFIG_GVP11_SCSI)	+= gvp11.o	wd33c93.o
-obj-$(CONFIG_SCSI_PC980155)	+= pc980155.o	wd33c93.o
 obj-$(CONFIG_MVME147_SCSI)	+= mvme147.o	wd33c93.o
 obj-$(CONFIG_SGIWD93_SCSI)	+= sgiwd93.o	wd33c93.o
 obj-$(CONFIG_CYBERSTORM_SCSI)	+= NCR53C9x.o	cyberstorm.o
@@ -109,6 +108,7 @@
 obj-$(CONFIG_SCSI_PLUTO)	+= pluto.o
 obj-$(CONFIG_SCSI_DECNCR)	+= NCR53C9x.o	dec_esp.o
 obj-$(CONFIG_BLK_DEV_3W_XXXX_RAID) += 3w-xxxx.o
+obj-$(CONFIG_SCSI_3W_9XXX)	+= 3w-9xxx.o
 obj-$(CONFIG_SCSI_PPA)		+= ppa.o
 obj-$(CONFIG_SCSI_IMM)		+= imm.o
 obj-$(CONFIG_JAZZ_ESP)		+= NCR53C9x.o	jazz_esp.o
@@ -132,6 +132,7 @@
 obj-$(CONFIG_SCSI_SATA_VITESSE)	+= libata.o sata_vsc.o
 obj-$(CONFIG_SCSI_SATA_SIS)	+= libata.o sata_sis.o
 obj-$(CONFIG_SCSI_SATA_SX4)	+= libata.o sata_sx4.o
+obj-$(CONFIG_SCSI_SATA_NV)	+= libata.o sata_nv.o
 
 obj-$(CONFIG_ARM)		+= arm/
 
@@ -147,20 +148,14 @@
 				   scsi_devinfo.o
 scsi_mod-$(CONFIG_SYSCTL)	+= scsi_sysctl.o
 scsi_mod-$(CONFIG_SCSI_PROC_FS)	+= scsi_proc.o
-scsi_mod-$(CONFIG_X86_PC9800)	+= scsi_pc98.o
 
 sd_mod-objs	:= sd.o
 sr_mod-objs	:= sr.o sr_ioctl.o sr_vendor.o
 initio-objs	:= ini9100u.o i91uscsi.o
 a100u2w-objs	:= inia100.o i60uscsi.o
 ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
-		:= -DCONFIG_NCR53C8XX_PREFETCH \
-			-DCONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS \
-			-DCONFIG_SCSI_NCR53C8XX_NO_NVRAM \
-			-DSCSI_NCR_BIG_ENDIAN -DSIMULATED_INTFLY
-ncr53c8xx-flags-$(CONFIG_SCSI_NCR_Q720) \
-		:= -DCONFIG_SCSI_NCR53C8XX_NO_NVRAM \
-			-DSIMULATED_INTFLY
+		:= -DCONFIG_NCR53C8XX_PREFETCH -DSCSI_NCR_BIG_ENDIAN \
+			-DCONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS
 CFLAGS_ncr53c8xx.o	:= $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
 zalon7xx-objs	:= zalon.o ncr53c8xx.o
 NCR_Q720_mod-objs	:= NCR_Q720.o ncr53c8xx.o

Index: NCR5380.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/NCR5380.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NCR5380.c	15 Aug 2004 22:22:44 -0000	1.5
+++ NCR5380.c	2 Sep 2004 19:51:18 -0000	1.6
@@ -28,6 +28,13 @@
 
 /*
  * $Log$
+ * Revision 1.6  2004/09/02 19:51:18  kenn
+ * Merge with 2.6.8
+ *
+ *
+ * Revision 1.1.1.20  2004/09/02 19:06:03  kenn
+ * Import of pristine Linus 2.6.8 tree
+ *
  * Revision 1.5  2004/08/15 22:22:44  kenn
  * Apply the locking bits of this patch
  *
@@ -1268,7 +1275,7 @@
 					 * and see if we can do an information transfer,
 					 * with failures we will restart.
 					 */
-					hostdata->selecting = 0;	
+					hostdata->selecting = NULL;
 					/* RvC: have to preset this to indicate a new command is being performed */
 
 					if (!NCR5380_select(instance, tmp,
@@ -1649,7 +1656,7 @@
 				   to go to sleep */
 	}
 
-	hostdata->selecting = 0;	/* clear this pointer, because we passed the
+	hostdata->selecting = NULL;/* clear this pointer, because we passed the
 					   waiting period */
 	if ((NCR5380_read(STATUS_REG) & (SR_SEL | SR_IO)) == (SR_SEL | SR_IO)) {
 		NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);

[LV-k25-commit] kernel-2.5/drivers/video/logo logo.c,1.3,1.4

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/logo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13010/drivers/video/logo

Modified Files:
	logo.c 
Log Message:
Merge with 2.6.8


Index: logo.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/logo/logo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- logo.c	28 Jul 2004 22:49:19 -0000	1.3
+++ logo.c	2 Sep 2004 19:51:19 -0000	1.4
@@ -11,6 +11,7 @@
 
 #include <linux/config.h>
 #include <linux/linux_logo.h>
+#include <linux/stddef.h>
 
 #ifdef CONFIG_M68K
 #include <asm/setup.h>
@@ -35,7 +36,7 @@
 
 const struct linux_logo *fb_find_logo(int depth)
 {
-	const struct linux_logo *logo = 0;
+	const struct linux_logo *logo = NULL;
 
 	if (depth >= 1) {
 #ifdef CONFIG_LOGO_LINUX_MONO

[LV-k25-commit] kernel-2.5/scripts empty.c,1.1.1.1,NONE file2alias.c,1.1.1.6,NONE mk_elfconfig.c,1.1.1.3,NONE mkconfigs,1.1.1.3,NONE mkspec,1.1.1.7,NONE modpost.c,1.1.1.15,NONE modpost.h,1.1.1.5,NONE sumversion.c,1.1.1.3,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10874/scripts

Removed Files:
	empty.c file2alias.c mk_elfconfig.c mkconfigs mkspec modpost.c 
	modpost.h sumversion.c 
Log Message:
Merge with 2.6.8


--- modpost.h DELETED ---

--- mk_elfconfig.c DELETED ---

--- mkconfigs DELETED ---

--- empty.c DELETED ---

--- modpost.c DELETED ---

--- mkspec DELETED ---

--- file2alias.c DELETED ---

--- sumversion.c DELETED ---