Merge with Linux 2.4.0-test6-pre4.

6 files changed, 43 insertions, 38 deletions

diff --git a/drivers/char/Config.in b/drivers/char/Config.in
index f41c3d48b..2ac91160d 100644
--- a/drivers/char/Config.in
+++ b/drivers/char/Config.in
@@ -259,7 +259,7 @@ endmenu
 
 tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP
 if [ "$CONFIG_AGP" != "n" ]; then
-   bool '  Intel 440LX/BX/GX support' CONFIG_AGP_INTEL
+   bool '  Intel 440LX/BX/GX 840 support' CONFIG_AGP_INTEL
    bool '  Intel I810/I810 DC100/I810e support' CONFIG_AGP_I810
    bool '  VIA chipset support' CONFIG_AGP_VIA
    bool '  AMD Irongate support' CONFIG_AGP_AMD
diff --git a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
index dcc8176f9..573419a28 100644
--- a/drivers/char/agp/agpgart_be.c
+++ b/drivers/char/agp/agpgart_be.c
@@ -2114,6 +2114,12 @@ static struct {
 #endif /* CONFIG_AGP_SIS */
 
 #ifdef CONFIG_AGP_VIA
+	{ PCI_DEVICE_ID_VIA_8371_0,
+		PCI_VENDOR_ID_VIA,
+		VIA_APOLLO_SUPER,
+		"Via",
+		"Apollo Super",
+		via_generic_setup },
 	{ PCI_DEVICE_ID_VIA_8501_0,
 		PCI_VENDOR_ID_VIA,
 		VIA_MVP4,
@@ -2183,16 +2189,15 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
 	 * there is a 'generic' bridge entry for this vendor */
 	if (agp_try_unsupported && agp_bridge_info[i].device_id == 0) {
 		printk(KERN_WARNING PFX "Trying generic %s routines"
-		       " for device id: %x\n",
+		       " for device id: %04x\n",
 		       agp_bridge_info[i].vendor_name, pdev->device);
 		agp_bridge.type = agp_bridge_info[i].chipset;
 		return agp_bridge_info[i].chipset_setup (pdev);
 	}
 
-	printk(KERN_ERR PFX "Unsupported %s chipset,"
-	       " you might want to try "
-	       "agp_try_unsupported=1.\n",
-	       agp_bridge_info[i].vendor_name);
+	printk(KERN_ERR PFX "Unsupported %s chipset (device id: %04x),"
+	       " you might want to try agp_try_unsupported=1.\n",
+	       agp_bridge_info[i].vendor_name, pdev->device);
 	return -ENODEV;
 }
 
diff --git a/drivers/char/drm/agpsupport.c b/drivers/char/drm/agpsupport.c
index 48a6aa5f9..e1e1ccedd 100644
--- a/drivers/char/drm/agpsupport.c
+++ b/drivers/char/drm/agpsupport.c
@@ -289,20 +289,21 @@ drm_agp_head_t *drm_agp_init(void)
 		(*drm_agp.copy_info)(&head->agp_info);
 		head->memory = NULL;
 		switch (head->agp_info.chipset) {
-		case INTEL_GENERIC:  head->chipset = "Intel";          break;
-		case INTEL_LX:       head->chipset = "Intel 440LX";    break;
-		case INTEL_BX:       head->chipset = "Intel 440BX";    break;
-		case INTEL_GX:       head->chipset = "Intel 440GX";    break;
-		case INTEL_I810:     head->chipset = "Intel i810";     break;
-		case VIA_GENERIC:    head->chipset = "VIA";            break;
-		case VIA_VP3:        head->chipset = "VIA VP3";        break;
-		case VIA_MVP3:       head->chipset = "VIA MVP3";       break;
-		case VIA_APOLLO_PRO: head->chipset = "VIA Apollo Pro"; break;
-		case SIS_GENERIC:    head->chipset = "SiS";            break;
-		case AMD_GENERIC:    head->chipset = "AMD";            break;
-		case AMD_IRONGATE:   head->chipset = "AMD Irongate";   break;
-		case ALI_GENERIC:    head->chipset = "ALi";            break;
-		case ALI_M1541:      head->chipset = "ALi M1541";      break;
+		case INTEL_GENERIC:    head->chipset = "Intel";            break;
+		case INTEL_LX:         head->chipset = "Intel 440LX";      break;
+		case INTEL_BX:         head->chipset = "Intel 440BX";      break;
+		case INTEL_GX:         head->chipset = "Intel 440GX";      break;
+		case INTEL_I810:       head->chipset = "Intel i810";       break;
+		case VIA_GENERIC:      head->chipset = "VIA";              break;
+		case VIA_VP3:          head->chipset = "VIA VP3";          break;
+		case VIA_MVP3:         head->chipset = "VIA MVP3";         break;
+		case VIA_APOLLO_PRO:   head->chipset = "VIA Apollo Pro";   break;
+		case VIA_APOLLO_SUPER: head->chipset = "VIA Apollo Super"; break;
+		case SIS_GENERIC:      head->chipset = "SiS";              break;
+		case AMD_GENERIC:      head->chipset = "AMD";              break;
+		case AMD_IRONGATE:     head->chipset = "AMD Irongate";     break;
+		case ALI_GENERIC:      head->chipset = "ALi";              break;
+		case ALI_M1541:        head->chipset = "ALi M1541";        break;
 		default:
 		}
 		DRM_INFO("AGP %d.%d on %s @ 0x%08lx %dMB\n",
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 3e5149c91..e4783c8db 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -578,7 +578,9 @@ extern void	     drm_vm_close(struct vm_area_struct *vma);
 extern int	     drm_mmap_dma(struct file *filp,
 				  struct vm_area_struct *vma);
 extern int	     drm_mmap(struct file *filp, struct vm_area_struct *vma);
-
+extern struct vm_operations_struct drm_vm_ops;
+extern struct vm_operations_struct drm_vm_shm_ops;
+extern struct vm_operations_struct drm_vm_dma_ops;
 
 				/* Proc support (proc.c) */
 extern int	     drm_proc_init(drm_device_t *dev);
diff --git a/drivers/char/drm/drm_syms.c b/drivers/char/drm/drm_syms.c
index e7aaf569d..661ac4816 100644
--- a/drivers/char/drm/drm_syms.c
+++ b/drivers/char/drm/drm_syms.c
@@ -31,6 +31,9 @@ EXPORT_SYMBOL(drm_vm_open);
 EXPORT_SYMBOL(drm_vm_close);
 EXPORT_SYMBOL(drm_mmap_dma);
 EXPORT_SYMBOL(drm_mmap);
+EXPORT_SYMBOL(drm_vm_ops);
+EXPORT_SYMBOL(drm_vm_shm_ops);
+EXPORT_SYMBOL(drm_vm_dma_ops);
 
 /* Proc support (proc.c) */
 EXPORT_SYMBOL(drm_proc_init);
diff --git a/drivers/char/radio-typhoon.c b/drivers/char/radio-typhoon.c
index 434dff875..a0bbf343f 100644
--- a/drivers/char/radio-typhoon.c
+++ b/drivers/char/radio-typhoon.c
@@ -300,32 +300,26 @@ static struct video_device typhoon_radio =
 
 static int typhoon_get_info(char *buf, char **start, off_t offset, int len)
 {
+	char *out = buf;
+
 	#ifdef MODULE
 	    #define MODULEPROCSTRING "Driver loaded as a module"
 	#else
 	    #define MODULEPROCSTRING "Driver compiled into kernel"
 	#endif
 
-        #define LIMIT (PAGE_SIZE - 80)
-
-	len = 0;
-	len += sprintf(buf + len, BANNER);
-	if (len > LIMIT) return len;
-	len += sprintf(buf + len, "Load type: " MODULEPROCSTRING "\n\n");
-	if (len > LIMIT) return len;
-	len += sprintf(buf + len, "frequency = %lu kHz\n",
+	/* output must be kept under PAGE_SIZE */
+	out += sprintf(out, BANNER);
+	out += sprintf(out, "Load type: " MODULEPROCSTRING "\n\n");
+	out += sprintf(out, "frequency = %lu kHz\n",
 		typhoon_unit.curfreq >> 4);
-	if (len > LIMIT) return len;
-	len += sprintf(buf + len, "volume = %d\n", typhoon_unit.curvol);
-	if (len > LIMIT) return len;
-	len += sprintf(buf + len, "mute = %s\n", typhoon_unit.muted ?
+	out += sprintf(out, "volume = %d\n", typhoon_unit.curvol);
+	out += sprintf(out, "mute = %s\n", typhoon_unit.muted ?
 		"on" : "off");
-	if (len > LIMIT) return len;
-	len += sprintf(buf + len, "iobase = 0x%x\n", typhoon_unit.iobase);
-	if (len > LIMIT) return len;
-	len += sprintf(buf + len, "mute frequency = %lu kHz\n",
+	out += sprintf(out, "iobase = 0x%x\n", typhoon_unit.iobase);
+	out += sprintf(out, "mute frequency = %lu kHz\n",
 		typhoon_unit.mutefreq >> 4);
-	return len;
+	return out - buf;
 }
 
 #endif /* CONFIG_RADIO_TYPHOON_PROC_FS */