rpms/kernel/devel jwltest-dma-x86_64.patch, NONE, 1.1.10.1 jwltest-ne2k-pci-set-master.patch, NONE, 1.1.2.1 jwltest-sk98lin-neuter.patch, NONE, 1.1.4.1 kernel-2.6.spec, 1.1739, 1.1739.2.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 5 18:44:38 UTC 2005
Author: linville
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29670
Modified Files:
Tag: private-linville-jwltest-fc5-6-branch
kernel-2.6.spec
Added Files:
Tag: private-linville-jwltest-fc5-6-branch
jwltest-dma-x86_64.patch jwltest-ne2k-pci-set-master.patch
jwltest-sk98lin-neuter.patch
Log Message:
jwltest-dma-x86_64.patch:
dma-mapping.h | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+)
--- NEW FILE jwltest-dma-x86_64.patch ---
--- linux-2.6.13/include/asm-x86_64/dma-mapping.h.orig 2005-09-10 16:57:13.698387495 -0400
+++ linux-2.6.13/include/asm-x86_64/dma-mapping.h 2005-09-10 16:57:44.244303844 -0400
@@ -85,6 +85,34 @@ static inline void dma_sync_single_for_d
flush_write_buffers();
}
+static inline void dma_sync_single_range_for_cpu(struct device *hwdev,
+ dma_addr_t dma_handle,
+ unsigned long offset,
+ size_t size, int direction)
+{
+ if (direction == DMA_NONE)
+ out_of_line_bug();
+
+ if (swiotlb)
+ return swiotlb_sync_single_range_for_cpu(hwdev,dma_handle,offset,size,direction);
+
+ flush_write_buffers();
+}
+
+static inline void dma_sync_single_range_for_device(struct device *hwdev,
+ dma_addr_t dma_handle,
+ unsigned long offset,
+ size_t size, int direction)
+{
+ if (direction == DMA_NONE)
+ out_of_line_bug();
+
+ if (swiotlb)
+ return swiotlb_sync_single_range_for_device(hwdev,dma_handle,offset,size,direction);
+
+ flush_write_buffers();
+}
+
static inline void dma_sync_sg_for_cpu(struct device *hwdev,
struct scatterlist *sg,
int nelems, int direction)
jwltest-ne2k-pci-set-master.patch:
ne2k-pci.c | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE jwltest-ne2k-pci-set-master.patch ---
--- linux-2.6.14/drivers/net/ne2k-pci.c.orig 2005-12-05 13:37:55.000000000 -0500
+++ linux-2.6.14/drivers/net/ne2k-pci.c 2005-12-05 13:41:39.000000000 -0500
@@ -675,6 +675,7 @@ static int ne2k_pci_resume (struct pci_d
pci_set_power_state(pdev, 0);
pci_restore_state(pdev);
pci_enable_device(pdev);
+ pci_set_master(pdev);
NS8390_init(dev, 1);
netif_device_attach(dev);
jwltest-sk98lin-neuter.patch:
skge.c | 2 --
1 files changed, 2 deletions(-)
--- NEW FILE jwltest-sk98lin-neuter.patch ---
--- linux-2.6.13/drivers/net/sk98lin/skge.c.orig 2005-10-20 15:19:17.000000000 -0400
+++ linux-2.6.13/drivers/net/sk98lin/skge.c 2005-10-20 15:19:25.000000000 -0400
@@ -5227,8 +5227,6 @@
{ 0 }
};
-MODULE_DEVICE_TABLE(pci, skge_pci_tbl);
-
static struct pci_driver skge_driver = {
.name = "sk98lin",
.id_table = skge_pci_tbl,
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1739
retrieving revision 1.1739.2.1
diff -u -r1.1739 -r1.1739.2.1
--- kernel-2.6.spec 4 Dec 2005 07:50:40 -0000 1.1739
+++ kernel-2.6.spec 5 Dec 2005 18:44:34 -0000 1.1739.2.1
@@ -20,7 +20,8 @@
%define sublevel 14
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}
-%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .jwltest.6
%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
%define signmodules 0
%define make_target bzImage
@@ -154,8 +155,9 @@
License: GPLv2
Version: %{rpmversion}
Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64
ExclusiveOS: Linux
Provides: kernel = %{version}
Provides: kernel-drm = 4.3.0
@@ -215,6 +217,7 @@
Patch201: linux-2.6-x86-apic-off-by-default.patch
Patch202: linux-2.6-x86-vga-vidfail.patch
Patch203: linux-2.6.14-intel-cache-build.patch
+Patch204: jwltest-dma-x86_64.patch
# 300 - 399 ppc(64)
Patch300: linux-2.6.15-default-powerpc.patch
@@ -226,6 +229,7 @@
Patch310: linux-2.6.15-mv643xx-fixes.patch
# 400 - 499 ia64
+
# 500 - 599 s390(x)
# 600 - 699 sparc(64)
@@ -311,6 +315,8 @@
# NIC driver updates
Patch1301: linux-2.6-net-sundance-ip100A.patch
+Patch1302: jwltest-sk98lin-neuter.patch
+Patch1303: jwltest-ne2k-pci-set-master.patch
# Squashfs
Patch1400: linux-2.6-squashfs.patch
@@ -594,6 +600,8 @@
%patch202 -p1
# exitfunc called from initfunc.
%patch203 -p1
+# implement dma_sync_single_range_for_{cpu,device}
+%patch204 -p1
#
# ppc64
@@ -742,6 +750,10 @@
# NIC driver fixes.
# New PCI ID for sundance driver.
%patch1301 -p1
+# neuter sk98lin (as far as userland is concerned)
+%patch1302 -p1
+# put-back pci_set_master in ne2k_pci_resume
+%patch1303 -p1
# Squashfs
%patch1400 -p1
More information about the fedora-cvs-commits
mailing list