lkml.org 
[lkml]   [2008]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[mmotm 10 Oct][PATCH 1/2] fix build error of git-tip
Date

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@jp.fujitsu.com>
CC: Yinghai Lu <yhlu.kernel@gmail.com>
CC: Ingo Molnar <mingo@elte.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)
{
}




\
 
 \ /
  Last update: 2008-10-12 15:43    [W:0.028 / U:0.984 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site