[PATCH] Linux 2.6.17.11 - fix compilation error on IA64

[Fernando Luis Vázquez Cao]

The commit 8833ebaa3f4325820fe3338ccf6fae04f6669254 introduced a change that makes
the compilation of a IA64 kernel fail as follows:

  GEN     usr/initramfs_data.cpio.gz
  AS      usr/initramfs_data.o
  LD      usr/built-in.o
  CC      arch/ia64/kernel/acpi.o
  AS      arch/ia64/kernel/entry.o
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

This patch fixes this.

Signed-off-by: Fernando Vazquez <fernando@xxxxxxxxxxxxxxxxx>
---

diff -urNp linux-2.6.17.11/include/asm-ia64/mman.h linux-2.6.17.11-fix/include/asm-ia64/mman.h
--- linux-2.6.17.11/include/asm-ia64/mman.h	2006-08-24 10:29:56.000000000 +0900
+++ linux-2.6.17.11-fix/include/asm-ia64/mman.h	2006-08-24 10:33:13.000000000 +0900
@@ -8,7 +8,7 @@
  *	David Mosberger-Tang <davidm@xxxxxxxxxx>, Hewlett-Packard Co
  */
 
-#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);


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/