r1371 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Joshua Kwan]

Author: joshk
Date: 2004-08-27 02:57:47 -0600 (Fri, 27 Aug 2004)
New Revision: 1371

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-disambiguate-proc_name.dpatch
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc32-export-more-ksyms.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5
Log:
more patches


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5	2004-08-27 08:57:09 UTC (rev 1370)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5	2004-08-27 08:57:47 UTC (rev 1371)
@@ -49,3 +49,5 @@
 sparc64-update
 sparc64-sunsab-skip-fix
 sparc64-syslog-register
+sparc32-export-more-ksyms
+scsi-disambiguate-proc_name

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-disambiguate-proc_name.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-disambiguate-proc_name.dpatch	2004-08-27 08:57:09 UTC (rev 1370)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-disambiguate-proc_name.dpatch	2004-08-27 08:57:47 UTC (rev 1371)
@@ -0,0 +1,61 @@
+#!/bin/sh -e
+# DP: disambiguate 'esp' SCSI devices
+# DP: upstream-status: submitted
+
+. $(dirname $0)/DPATCH
+
+--- kernel-source-2.6.8/drivers/scsi/mca_53c9x.c~	2004-08-27 01:40:00.000000000 -0700
++++ kernel-source-2.6.8/drivers/scsi/mca_53c9x.c	2004-08-27 01:40:02.000000000 -0700
+@@ -445,7 +445,7 @@
+ }
+ 
+ static Scsi_Host_Template driver_template = {
+-	.proc_name		= "esp",
++	.proc_name		= "mca_53c9x",
+ 	.name			= "NCR 53c9x SCSI",
+ 	.detect			= mca_esp_detect,
+ 	.slave_alloc		= esp_slave_alloc,
+--- kernel-source-2.6.8/drivers/scsi/jazz_esp.c~	2004-08-27 01:40:35.000000000 -0700
++++ kernel-source-2.6.8/drivers/scsi/jazz_esp.c	2004-08-27 01:41:06.000000000 -0700
+@@ -286,7 +286,7 @@
+ }
+ 
+ static Scsi_Host_Template driver_template = {
+-	.proc_name		= "esp",
++	.proc_name		= "jazz_esp",
+ 	.proc_info		= &esp_proc_info,
+ 	.name			= "ESP 100/100a/200",
+ 	.detect			= jazz_esp_detect,
+--- kernel-source-2.6.8/drivers/scsi/mac_esp.c~	2004-08-27 01:41:22.000000000 -0700
++++ kernel-source-2.6.8/drivers/scsi/mac_esp.c	2004-08-27 01:41:27.000000000 -0700
+@@ -731,7 +731,7 @@
+ }
+ 
+ static Scsi_Host_Template driver_template = {
+-	.proc_name		= "esp",
++	.proc_name		= "mac_esp",
+ 	.name			= "Mac 53C9x SCSI",
+ 	.detect			= mac_esp_detect,
+ 	.slave_alloc		= esp_slave_alloc,
+--- kernel-source-2.6.8/drivers/scsi/dec_esp.c~	2004-08-27 01:42:06.000000000 -0700
++++ kernel-source-2.6.8/drivers/scsi/dec_esp.c	2004-08-27 01:42:08.000000000 -0700
+@@ -120,7 +120,7 @@
+ }
+ 
+ static Scsi_Host_Template driver_template = {
+-	.proc_name		= "esp",
++	.proc_name		= "dec_esp",
+ 	.proc_info		= &esp_proc_info,
+ 	.name			= "NCR53C94",
+ 	.detect			= dec_esp_detect,
+--- kernel-source-2.6.8/drivers/scsi/sun3x_esp.c~	2004-08-27 01:46:32.000000000 -0700
++++ kernel-source-2.6.8/drivers/scsi/sun3x_esp.c	2004-08-27 01:46:36.000000000 -0700
+@@ -370,7 +370,7 @@
+ }
+ 
+ static Scsi_Host_Template driver_template = {
+-	.proc_name		= "esp",
++	.proc_name		= "sun3x_esp",
+ 	.proc_info		= &esp_proc_info,
+ 	.name			= "Sun ESP 100/100a/200",
+ 	.detect			= sun3x_esp_detect,

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc32-export-more-ksyms.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc32-export-more-ksyms.dpatch	2004-08-27 08:57:09 UTC (rev 1370)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc32-export-more-ksyms.dpatch	2004-08-27 08:57:47 UTC (rev 1371)
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+# DP: export more symbols for sparc32 so we can get our stuff built
+# DP: upstream-status: unsent
+
+. $(dirname $0)/DPATCH
+
+--- kernel-source-2.6.8/arch/sparc/kernel/sparc_ksyms.c~	2004-08-27 01:09:06.000000000 -0700
++++ kernel-source-2.6.8/arch/sparc/kernel/sparc_ksyms.c	2004-08-27 01:10:27.000000000 -0700
+@@ -214,6 +214,10 @@
+ EXPORT_SYMBOL(pci_dma_sync_single_for_device);
+ EXPORT_SYMBOL(pci_dma_sync_sg_for_cpu);
+ EXPORT_SYMBOL(pci_dma_sync_sg_for_device);
++EXPORT_SYMBOL(pci_map_sg);
++EXPORT_SYMBOL(pci_unmap_sg);
++EXPORT_SYMBOL(pci_map_page);
++EXPORT_SYMBOL(pci_unmap_page);
+ /* Actually, ioremap/iounmap are not PCI specific. But it is ok for drivers. */
+ EXPORT_SYMBOL(ioremap);
+ EXPORT_SYMBOL(iounmap);
+@@ -298,6 +302,9 @@
+ /* Cache flushing.  */
+ EXPORT_SYMBOL(sparc_flush_page_to_ram);
+ 
++/* For when serial stuff is built as modules. */
++EXPORT_SYMBOL(sun_do_break);
++
+ EXPORT_SYMBOL(__ret_efault);
+ 
+ EXPORT_SYMBOL(memcmp);