Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970ec1a8 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

[IA64] fix __apci_unmap_table 



Impact: fix build error

to fix:

  tip/arch/ia64/kernel/acpi.c:203: error: conflicting types for '__acpi_unmap_table'
  tip/include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
  tip/arch/ia64/kernel/acpi.c:203: error: conflicting types for '__acpi_unmap_table'
  tip/include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8e1568f3

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size) 
	return __va(phys_addr);

}



char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size)

void __init __acpi_unmap_table(char *map, unsigned long size)

{

}

include/linux/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table); 
typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);



char * __acpi_map_table (unsigned long phys_addr, unsigned long size);

void __init __acpi_unmap_table(char *map, unsigned long size);

void __acpi_unmap_table(char *map, unsigned long size);

int early_acpi_boot_init(void);

int acpi_boot_init (void);

int acpi_boot_table_init (void);