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

Commit bb8c4701 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform documentation fix from Ingo Molnar.

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/acpi: Correct out-of-date comment of __acpi_map_table()
parents 05eebfb2 45f1330a

arch/x86/kernel/acpi/boot.c

+3 −10
Original line number Original line Diff line number Diff line
@@ -141,16 +141,8 @@ static u32 irq_to_gsi(int irq) 
}

}





/*

/*

 * Temporarily use the virtual area starting from FIX_IO_APIC_BASE_END,

 * This is just a simple wrapper around early_ioremap(),

 * to map the target physical address. The problem is that set_fixmap()

 * with sanity checks for phys == 0 and size == 0.

 * provides a single page, and it is possible that the page is not

 * sufficient.

 * By using this area, we can map up to MAX_IO_APICS pages temporarily,

 * i.e. until the next __va_range() call.

 *

 * Important Safety Note:  The fixed I/O APIC page numbers are *subtracted*

 * from the fixed base.  That's why we start at FIX_IO_APIC_BASE_END and

 * count idx down while incrementing the phys address.

 */

 */

char *__init __acpi_map_table(unsigned long phys, unsigned long size)

char *__init __acpi_map_table(unsigned long phys, unsigned long size)

{

{
@@ -160,6 +152,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 




	return early_ioremap(phys, size);

	return early_ioremap(phys, size);

}

}



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

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

{

{

	if (!map || !size)

	if (!map || !size)