Author: dan Date: 2005-10-13 19:42:24 +0000 (Thu, 13 Oct 2005) New Revision: 1037
Modified: linux-kernel-headers/trunk/debian/changelog linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch Log: * Correct ppc64 memory.h patch. Modified: linux-kernel-headers/trunk/debian/changelog =================================================================== --- linux-kernel-headers/trunk/debian/changelog 2005-10-13 19:37:26 UTC (rev 1036) +++ linux-kernel-headers/trunk/debian/changelog 2005-10-13 19:42:24 UTC (rev 1037) @@ -10,9 +10,10 @@ are removed in the postrm, so Conflicts is not enough to make sure amd64-libs-dev is fully gone before we install). * Merge armeb support from Lennert Buytenhek - <[EMAIL PROTECTED]> (Closes: #333596). + <[EMAIL PROTECTED]> (Closes: #333596). + * Correct ppc64 memory.h patch. - -- Daniel Jacobowitz <[EMAIL PROTECTED]> Thu, 13 Oct 2005 15:28:37 -0400 + -- Daniel Jacobowitz <[EMAIL PROTECTED]> Thu, 13 Oct 2005 15:42:01 -0400 linux-kernel-headers (2.6.13+0rc3-1.1) unstable; urgency=low Modified: linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch 2005-10-13 19:37:26 UTC (rev 1036) +++ linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch 2005-10-13 19:42:24 UTC (rev 1037) @@ -1,24 +1,20 @@ #268078: Change inline -> __inline__. -diff -ruN linux-2.6.0-test7-bk/debian/patches/ppc64-inline.patch linux-2.6.0-test7-bk-new/debian/patches/ppc64-inline.patch ---- linux-2.6.0-test7-bk/debian/patches/ppc64-inline.patch 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.0-test7-bk-new/debian/patches/ppc64-inline.patch 2004-08-22 15:17:45.724964280 +0000 -@@ -0,0 +1,18 @@ -+diff -ruN include/asm-ppc64/memory.h include-new/asm-ppc64/memory.h -+--- include/asm-ppc64/memory.h 2004-08-22 15:17:06.035008296 +0000 -++++ include-new/asm-ppc64/memory.h 2004-08-22 15:12:50.302014528 +0000 -+@@ -23,12 +23,12 @@ -+ #define ISYNC_ON_SMP -+ #endif -+ -+-static inline void eieio(void) -++static __inline__ void eieio(void) -+ { -+ __asm__ __volatile__ ("eieio" : : : "memory"); -+ } -+ -+-static inline void isync(void) -++static __inline__ void isync(void) -+ { -+ __asm__ __volatile__ ("isync" : : : "memory"); -+ } +diff -ruN include/asm-ppc64/memory.h include-new/asm-ppc64/memory.h +--- include/asm-ppc64/memory.h 2004-08-22 15:17:06.035008296 +0000 ++++ include-new/asm-ppc64/memory.h 2004-08-22 15:12:50.302014528 +0000 +@@ -23,12 +23,12 @@ + #define ISYNC_ON_SMP + #endif + +-static inline void eieio(void) ++static __inline__ void eieio(void) + { + __asm__ __volatile__ ("eieio" : : : "memory"); + } + +-static inline void isync(void) ++static __inline__ void isync(void) + { + __asm__ __volatile__ ("isync" : : : "memory"); + } -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]