rpms/kernel/devel jwltest-swiotlb-move.patch, 1.1.4.1, 1.1.4.2 kernel-2.6.spec, 1.1619.2.1, 1.1619.2.2 jwltest-e1000_ethtool_ops-whitespace.patch, 1.1.4.1, NONE jwltest-ethtool-perm-addr.patch, 1.1.4.1, NONE jwltest-rx_dropped.patch, 1.1.4.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Oct 20 19:08:09 UTC 2005


Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5208

Modified Files:
      Tag: private-linville-jwltest-fc5-5-branch
	jwltest-swiotlb-move.patch kernel-2.6.spec 
Removed Files:
      Tag: private-linville-jwltest-fc5-5-branch
	jwltest-e1000_ethtool_ops-whitespace.patch 
	jwltest-ethtool-perm-addr.patch jwltest-rx_dropped.patch 
Log Message:


jwltest-swiotlb-move.patch:
 arch/ia64/Kconfig           |    4 
 arch/ia64/lib/Makefile      |    2 
 arch/ia64/lib/swiotlb.c     |  657 --------------------------------------------
 arch/x86_64/kernel/Makefile |    2 
 lib/Makefile                |    2 
 lib/swiotlb.c               |  657 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 664 insertions(+), 660 deletions(-)

Index: jwltest-swiotlb-move.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/jwltest-swiotlb-move.patch,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- jwltest-swiotlb-move.patch	20 Oct 2005 18:01:06 -0000	1.1.4.1
+++ jwltest-swiotlb-move.patch	20 Oct 2005 19:08:04 -0000	1.1.4.2
@@ -1,6 +1,6 @@
---- linux-2.6.13/lib/Makefile.orig	2005-09-10 16:49:35.905536242 -0400
-+++ linux-2.6.13/lib/Makefile	2005-09-10 16:52:14.548365759 -0400
-@@ -43,6 +43,8 @@ obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
+--- linux-2.6.13/lib/Makefile.orig	2005-10-20 14:43:46.000000000 -0400
++++ linux-2.6.13/lib/Makefile	2005-10-20 15:05:05.000000000 -0400
+@@ -44,6 +44,8 @@
  obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
  obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  
@@ -9,8 +9,8 @@
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
  
---- /dev/null	2005-06-02 17:56:11.397464344 -0400
-+++ linux-2.6.13/lib/swiotlb.c	2005-09-10 16:52:14.546366026 -0400
+--- linux-2.6.13/lib/swiotlb.c.orig	2005-10-20 15:03:16.000000000 -0400
++++ linux-2.6.13/lib/swiotlb.c	2005-10-20 15:03:01.000000000 -0400
 @@ -0,0 +1,657 @@
 +/*
 + * Dynamic DMA mapping support.
@@ -137,8 +137,8 @@
 +	/*
 +	 * Get IO TLB memory from the low pages
 +	 */
-+	io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs *
-+					       (1 << IO_TLB_SHIFT));
++	io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs *
++					     (1 << IO_TLB_SHIFT), 0x100000000);
 +	if (!io_tlb_start)
 +		panic("Cannot allocate SWIOTLB buffer");
 +	io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);
@@ -669,9 +669,9 @@
 +EXPORT_SYMBOL(swiotlb_alloc_coherent);
 +EXPORT_SYMBOL(swiotlb_free_coherent);
 +EXPORT_SYMBOL(swiotlb_dma_supported);
---- linux-2.6.13/arch/x86_64/kernel/Makefile.orig	2005-09-10 16:49:32.444998075 -0400
-+++ linux-2.6.13/arch/x86_64/kernel/Makefile	2005-09-10 16:52:14.549365626 -0400
-@@ -27,7 +27,6 @@ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
+--- linux-2.6.13/arch/x86_64/kernel/Makefile.orig	2005-10-20 14:42:50.000000000 -0400
++++ linux-2.6.13/arch/x86_64/kernel/Makefile	2005-10-20 15:05:05.000000000 -0400
+@@ -27,7 +27,6 @@
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  obj-$(CONFIG_GART_IOMMU)	+= pci-gart.o aperture.o
  obj-$(CONFIG_DUMMY_IOMMU)	+= pci-nommu.o pci-dma.o
@@ -679,7 +679,7 @@
  obj-$(CONFIG_KPROBES)		+= kprobes.o
  obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o
  
-@@ -41,7 +40,6 @@ CFLAGS_vsyscall.o		:= $(PROFILING) -g0
+@@ -41,7 +40,6 @@
  bootflag-y			+= ../../i386/kernel/bootflag.o
  cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
  topology-y                     += ../../i386/mach-default/topology.o
@@ -687,9 +687,9 @@
  microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
  intel_cacheinfo-y		+= ../../i386/kernel/cpu/intel_cacheinfo.o
  quirks-y			+= ../../i386/kernel/quirks.o
---- linux-2.6.13/arch/ia64/lib/Makefile.orig	2005-09-10 16:49:31.667101891 -0400
-+++ linux-2.6.13/arch/ia64/lib/Makefile	2005-09-10 16:52:14.554364959 -0400
-@@ -9,7 +9,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3
+--- linux-2.6.13/arch/ia64/lib/Makefile.orig	2005-10-20 14:42:47.000000000 -0400
++++ linux-2.6.13/arch/ia64/lib/Makefile	2005-10-20 15:05:05.000000000 -0400
+@@ -9,7 +9,7 @@
  	bitop.o checksum.o clear_page.o csum_partial_copy.o		\
  	clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o	\
  	flush.o ip_fast_csum.o do_csum.o				\
@@ -698,8 +698,8 @@
  
  lib-$(CONFIG_ITANIUM)	+= copy_page.o copy_user.o memcpy.o
  lib-$(CONFIG_MCKINLEY)	+= copy_page_mck.o memcpy_mck.o
---- linux-2.6.13/arch/ia64/lib/swiotlb.c.orig	2005-09-10 16:49:31.671101357 -0400
-+++ linux-2.6.13/arch/ia64/lib/swiotlb.c	2005-09-10 16:52:14.552365226 -0400
+--- linux-2.6.13/arch/ia64/lib/swiotlb.c.orig	2005-10-20 15:02:52.000000000 -0400
++++ linux-2.6.13/arch/ia64/lib/swiotlb.c	2005-10-20 15:03:09.000000000 -0400
 @@ -1,657 +0,0 @@
 -/*
 - * Dynamic DMA mapping support.
@@ -826,8 +826,8 @@
 -	/*
 -	 * Get IO TLB memory from the low pages
 -	 */
--	io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs *
--					       (1 << IO_TLB_SHIFT));
+-	io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs *
+-					     (1 << IO_TLB_SHIFT), 0x100000000);
 -	if (!io_tlb_start)
 -		panic("Cannot allocate SWIOTLB buffer");
 -	io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);
@@ -1358,9 +1358,9 @@
 -EXPORT_SYMBOL(swiotlb_alloc_coherent);
 -EXPORT_SYMBOL(swiotlb_free_coherent);
 -EXPORT_SYMBOL(swiotlb_dma_supported);
---- linux-2.6.13/arch/ia64/Kconfig.orig	2005-09-10 16:49:31.614108963 -0400
-+++ linux-2.6.13/arch/ia64/Kconfig	2005-09-10 16:52:14.551365359 -0400
-@@ -26,6 +26,10 @@ config MMU
+--- linux-2.6.13/arch/ia64/Kconfig.orig	2005-10-20 14:42:47.000000000 -0400
++++ linux-2.6.13/arch/ia64/Kconfig	2005-10-20 15:05:05.000000000 -0400
+@@ -26,6 +26,10 @@
  	bool
  	default y
  


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1619.2.1
retrieving revision 1.1619.2.2
diff -u -r1.1619.2.1 -r1.1619.2.2
--- kernel-2.6.spec	20 Oct 2005 18:01:07 -0000	1.1619.2.1
+++ kernel-2.6.spec	20 Oct 2005 19:08:04 -0000	1.1619.2.2
@@ -305,9 +305,6 @@
 Patch1304: jwltest-b44-alloc.patch
 Patch1305: jwltest-3c59x-mmio.patch
 Patch1306: jwltest-3c59x-misc.patch
-Patch1307: jwltest-ethtool-perm-addr.patch
-Patch1308: jwltest-e1000_ethtool_ops-whitespace.patch
-Patch1309: jwltest-rx_dropped.patch
 
 # Netdump and Diskdump bits.
 Patch1500: linux-2.6-crashdump-common.patch
@@ -750,12 +747,6 @@
 %patch1305 -p1
 # misc 3c59x patches
 %patch1306 -p1
-# add support for ETHTOOL_GPERMADDR to a number of drivers
-%patch1307 -p1
-# cleanup some whitespace issues in e1000_ethtool_ops
-%patch1308 -p1
-# normalize handling of rx_dropped among some popular drivers
-%patch1309 -p1
 
 # netdump bits
 %patch1500 -p1


--- jwltest-e1000_ethtool_ops-whitespace.patch DELETED ---


--- jwltest-ethtool-perm-addr.patch DELETED ---


--- jwltest-rx_dropped.patch DELETED ---




More information about the fedora-cvs-commits mailing list