* [patch 04/37] fix compilation error on IA64 [not found] ` <20060906225444.GA15922@kroah.com> @ 2006-09-06 22:55 ` Greg KH 2006-09-07 8:45 ` Kirill Korotaev 0 siblings, 1 reply; 2+ messages in thread From: Greg KH @ 2006-09-06 22:55 UTC (permalink / raw) To: linux-kernel, stable, gregkh Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap, Dave Jones, Chuck Wolber, Chris Wedgwood, torvalds, akpm, alan, dev, linux-ia64, Fernando Vazquez -stable review patch. If anyone has any objections, please let us know. ------------------ From: Fernando Vazquez <fernando@oss.ntt.co.jp> The commit 8833ebaa3f4325820fe3338ccf6fae04f6669254 introduced a change that broke IA64 compilation as shown below: gcc -Wp,-MD,arch/ia64/kernel/.entry.o.d -nostdinc -isystem /usr/lib/gcc/ia64-linux-gnu/4.1.2/include -D__KERNEL__ -Iinclude -include include/linux/autoconf.h -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE -D__ASSEMBLY__ -mconstant-gp -c -o arch/ia64/kernel/entry.o arch/ia64/kernel/entry.S include/asm/mman.h: Assembler messages: include/asm/mman.h:13: Error: Unknown opcode `int ia64_map_check_rgn(unsigned long addr,unsigned long len,' include/asm/mman.h:14: Error: Unknown opcode `unsigned long flags)' make[1]: *** [arch/ia64/kernel/entry.o] Error 1 make: *** [arch/ia64/kernel] Error 2 The reason is that "asm/mman.h" is being included from entry.S indirectly through "asm/pgtable.h" (see code snips below). * arch/ia64/kernel/entry.S: ... #include <asm/pgtable.h> ... * include/asm-ia64/pgtable.h: ... #include <asm/mman.h> ... * include/asm-ia64/mman.h ... #ifdef __KERNEL__ #define arch_mmap_check ia64_map_check_rgn int ia64_map_check_rgn(unsigned long addr, unsigned long len, unsigned long flags); #endif ... Signed-off-by: Fernando Vazquez <fernando@intellilink.co.jp> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- include/asm-ia64/mman.h | 2 ++ 1 file changed, 2 insertions(+) --- linux-2.6.17.11.orig/include/asm-ia64/mman.h +++ linux-2.6.17.11/include/asm-ia64/mman.h @@ -9,10 +9,12 @@ */ #ifdef __KERNEL__ +#ifndef __ASSEMBLY__ #define arch_mmap_check ia64_map_check_rgn int ia64_map_check_rgn(unsigned long addr, unsigned long len, unsigned long flags); #endif +#endif #include <asm-generic/mman.h> -- ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 04/37] fix compilation error on IA64 2006-09-06 22:55 ` [patch 04/37] fix compilation error on IA64 Greg KH @ 2006-09-07 8:45 ` Kirill Korotaev 0 siblings, 0 replies; 2+ messages in thread From: Kirill Korotaev @ 2006-09-07 8:45 UTC (permalink / raw) To: Greg KH Cc: linux-kernel, stable, Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap, Dave Jones, Chuck Wolber, Chris Wedgwood, torvalds, akpm, alan, dev, linux-ia64, Fernando Vazquez Greg, The patch from Fernando Vazquez is incomplete. The first hunk is from Fernando's patch which fixes IA64 compilation. But there are some archs which do not include asm-generic/mman.h and thus will have arch_mmap_check undefined. Signed-Off-By: Kirill Korotaev <dev@sw.ru> --- a/include/asm-ia64/mman.h +++ b/include/asm-ia64/mman.h @@ -9,10 +9,12 @@ */ #ifdef __KERNEL__ +#ifndef __ASSEMBLY__ #define arch_mmap_check ia64_map_check_rgn int ia64_map_check_rgn(unsigned long addr, unsigned long len, unsigned long flags); #endif +#endif #include <asm-generic/mman.h> diff --git a/include/asm-alpha/mman.h b/include/asm-alpha/mman.h index 5f24c75..51cf354 100644 --- a/include/asm-alpha/mman.h +++ b/include/asm-alpha/mman.h @@ -52,4 +52,10 @@ #define MADV_DOFORK 11 /* do inherit ac #define MAP_ANON MAP_ANONYMOUS #define MAP_FILE 0 +#ifdef __KERNEL__ +#ifndef arch_mmap_check +#define arch_mmap_check(addr, len, flags) (0) +#endif +#endif + #endif /* __ALPHA_MMAN_H__ */ diff --git a/include/asm-mips/mman.h b/include/asm-mips/mman.h index 046cf68..f19e858 100644 --- a/include/asm-mips/mman.h +++ b/include/asm-mips/mman.h @@ -75,4 +75,10 @@ #define MADV_DOFORK 11 /* do inherit ac #define MAP_ANON MAP_ANONYMOUS #define MAP_FILE 0 +#ifdef __KERNEL__ +#ifndef arch_mmap_check +#define arch_mmap_check(addr, len, flags) (0) +#endif +#endif + #endif /* _ASM_MMAN_H */ diff --git a/include/asm-parisc/mman.h b/include/asm-parisc/mman.h index 0ef15ee..9829b31 100644 --- a/include/asm-parisc/mman.h +++ b/include/asm-parisc/mman.h @@ -59,4 +59,10 @@ #define MAP_ANON MAP_ANONYMOUS #define MAP_FILE 0 #define MAP_VARIABLE 0 +#ifdef __KERNEL__ +#ifndef arch_mmap_check +#define arch_mmap_check(addr, len, flags) (0) +#endif +#endif + #endif /* __PARISC_MMAN_H__ */ ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-09-07 8:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20060906224631.999046890@quad.kroah.org>
[not found] ` <20060906225444.GA15922@kroah.com>
2006-09-06 22:55 ` [patch 04/37] fix compilation error on IA64 Greg KH
2006-09-07 8:45 ` Kirill Korotaev
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox