[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20081012223808.1817.KOSAKI.MOTOHIRO@jp.fujitsu.com>
Date: Sun, 12 Oct 2008 22:39:58 +0900 (JST)
From: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
To: Yinghai Lu <yhlu.kernel@...il.com>, Ingo Molnar <mingo@...e.hu>,
Andrew Morton <akpm@...ux-foundation.org>
Cc: kosaki.motohiro@...fujitsu.com, LKML <linux-kernel@...r.kernel.org>
Subject: [mmotm 10 Oct][PATCH 1/2] fix build error of git-tip
Patch name: git-tip-fix.patch
Patch against: mmotm 10 Oct
Applied after: git-tip.patch
-----------
git-tip can't build on ia64 because __acpi_unmap_table() function tyep is wrong.
Then it cause following build error.
CC arch/ia64/kernel/acpi.o
arch/ia64/kernel/acpi.c:180: error: conflicting types for '__acpi_unmap_table'
include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
make[1]: *** [arch/ia64/kernel/acpi.o] Error 1
make: *** [arch/ia64/kernel] Error 2
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
CC: Yinghai Lu <yhlu.kernel@...il.com>
CC: Ingo Molnar <mingo@...e.hu>
---
arch/ia64/kernel/acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/arch/ia64/kernel/acpi.c
===================================================================
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -176,7 +176,7 @@ char *__init __acpi_map_table(unsigned l
return __va(phys_addr);
}
-char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size)
+void __init __acpi_unmap_table(char *virt_addr, unsigned long size)
{
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists