SOURCES: kernel-desktop-small_fixes.patch - oops, asm-powerpc/io.h...

[sparky]

Author: sparky                       Date: Thu Jun 22 02:47:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- oops, asm-powerpc/io.h includes asm-ppc/io.h, which ie realy used

---- Files affected:
SOURCES:
   kernel-desktop-small_fixes.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-small_fixes.patch
diff -u SOURCES/kernel-desktop-small_fixes.patch:1.7 SOURCES/kernel-desktop-small_fixes.patch:1.8
--- SOURCES/kernel-desktop-small_fixes.patch:1.7	Thu Jun 22 02:29:07 2006
+++ SOURCES/kernel-desktop-small_fixes.patch	Thu Jun 22 04:47:00 2006
@@ -64,16 +64,16 @@
  
  /*
   * Given a desired number of PAGE_CACHE_SIZE readahead pages, return a
---- linux-2.6.17/include/asm-powerpc/io.h~	2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.17/include/asm-powerpc/io.h	2006-06-22 02:10:00.000000000 +0200
-@@ -252,6 +252,10 @@
-  */
+--- linux-2.6.17/include/asm-ppc/io.h~	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/include/asm-ppc/io.h	2006-06-22 02:44:19.000000000 +0000
+@@ -445,6 +445,10 @@
  #define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)
+ #define page_to_bus(page)	(page_to_phys(page) + PCI_DRAM_OFFSET)
  
 +#define isa_virt_to_bus virt_to_phys
 +#define isa_page_to_bus page_to_phys
 +#define isa_bus_to_virt phys_to_virt
 +
- /* We do NOT want virtual merging, it would put too much pressure on
-  * our iommu allocator. Instead, we want drivers to be smart enough
-  * to coalesce sglists that happen to have been mapped in a contiguous
+ /* Enforce in-order execution of data I/O.
+  * No distinction between read/write on PPC; use eieio for all three.
+  */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-small_fixes.patch?r1=1.7&r2=1.8&f=u