[kernel] r7274 - in dists/sid/linux-2.6/debian: . patches patches/series

[Kyle McMartin]

Author: kyle
Date: Tue Aug 29 15:59:33 2006
New Revision: 7274

Added:
   dists/sid/linux-2.6/debian/patches/ia64-mman.h-fix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/8-extra

Log:
Fix ia64 build, patch from Christian Cotte-Barrot on linux-ia64
mailing list.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Aug 29 15:59:33 2006
@@ -12,8 +12,10 @@
   [ Kyle McMartin ]
   * hppa: Re-enable pa8800 fixing patches from James Bottomley.
     Pulled fresh from parisc-linux git tree.
+  * ia64: Pull in compile-failure fix from Christian Cotte-Barrot.
+    Pulled from linux-ia64 mailing list. Fix is correct. 
 
- -- Kyle McMartin <kyle at debian.org>  Tue, 29 Aug 2006 09:07:57 -0400
+ -- Kyle McMartin <kyle at debian.org>  Tue, 29 Aug 2006 11:56:31 -0400
 
 linux-2.6 (2.6.17-7) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/ia64-mman.h-fix.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/ia64-mman.h-fix.patch	Tue Aug 29 15:59:33 2006
@@ -0,0 +1,14 @@
+--- linux-2.6.17.11.ref/include/asm-ia64/mman.h	2006-08-23 23:16:33.000000000 +0200
++++ linux-2.6.17.11/include/asm-ia64/mman.h	2006-08-25 14:52:49.000000000 +0200
+@@ -9,9 +9,11 @@
+  */
+ 
+ #ifdef __KERNEL__
++#if !defined(__ASSEMBLY__)
+ #define arch_mmap_check	ia64_map_check_rgn
+ int ia64_map_check_rgn(unsigned long addr, unsigned long len,
+ 		unsigned long flags);
++#endif /* !__ASSEMBLY__ */
+ #endif
+ 
+ #include <asm-generic/mman.h>

Modified: dists/sid/linux-2.6/debian/patches/series/8-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/8-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/8-extra	Tue Aug 29 15:59:33 2006
@@ -1,2 +1,3 @@
 + pa8800-abstract-kmap.patch hppa
 + pa8800-kmap-implementation.patch hppa
++ ia64-mman.h-fix.patch ia64