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

[Kyle McMartin]

Author: kyle
Date: Tue Aug 29 16:36:37 2006
New Revision: 7275

Added:
   dists/sid/linux-2.6/debian/patches/fix-non-asm-generic-mman-h.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/8

Log:
Fix alpha/hppa/mips which were missing defines of arch_mmap_check since
they do not include the asm-generic/mman.h header.


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 16:36:37 2006
@@ -13,9 +13,11 @@
   * 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. 
+    Pulled from linux-ia64 mailing list. Fix is correct.
+  * hppa/alpha/mips: Fix compile-failure due to missing arch_mmap_check. Patch sent
+    upstream to stable at kernel.org. 
 
- -- Kyle McMartin <kyle at debian.org>  Tue, 29 Aug 2006 11:56:31 -0400
+ -- Kyle McMartin <kyle at debian.org>  Tue, 29 Aug 2006 12:34:00 -0400
 
 linux-2.6 (2.6.17-7) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/fix-non-asm-generic-mman-h.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/fix-non-asm-generic-mman-h.patch	Tue Aug 29 16:36:37 2006
@@ -0,0 +1,39 @@
+diff --git a/include/asm-alpha/mman.h b/include/asm-alpha/mman.h
+index 5f24c75..97ebc74 100644
+--- a/include/asm-alpha/mman.h
++++ b/include/asm-alpha/mman.h
+@@ -52,4 +52,8 @@ #define MADV_DOFORK	11		/* do inherit ac
+ #define MAP_ANON	MAP_ANONYMOUS
+ #define MAP_FILE	0
+ 
++#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
++#define arch_mmap_check(addr, len, flags)	(0)
++#endif
++
+ #endif /* __ALPHA_MMAN_H__ */
+diff --git a/include/asm-mips/mman.h b/include/asm-mips/mman.h
+index 046cf68..07b7cce 100644
+--- a/include/asm-mips/mman.h
++++ b/include/asm-mips/mman.h
+@@ -75,4 +75,8 @@ #define MADV_DOFORK	11		/* do inherit ac
+ #define MAP_ANON	MAP_ANONYMOUS
+ #define MAP_FILE	0
+ 
++#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
++#define arch_mmap_check(addr, len, flags)	(0)
++#endif
++
+ #endif /* _ASM_MMAN_H */
+diff --git a/include/asm-parisc/mman.h b/include/asm-parisc/mman.h
+index 0ef15ee..d015a4e 100644
+--- a/include/asm-parisc/mman.h
++++ b/include/asm-parisc/mman.h
+@@ -59,4 +59,8 @@ #define MAP_ANON	MAP_ANONYMOUS
+ #define MAP_FILE	0
+ #define MAP_VARIABLE	0
+ 
++#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
++#define arch_mmap_check(addr, len, flags)	(0)
++#endif
++
+ #endif /* __PARISC_MMAN_H__ */

Modified: dists/sid/linux-2.6/debian/patches/series/8
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/8	(original)
+++ dists/sid/linux-2.6/debian/patches/series/8	Tue Aug 29 16:36:37 2006
@@ -1,3 +1,4 @@
 + sound-pci-hda-mac-mini-quirks.diff
 + sound-pci-hda-intel-d965.diff
 + sound-pci-hda-mac-mini-intel945.diff
++ fix-non-asm-generic-mman-h.patch