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

Commit a56cdcb6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump',...

Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/header-fixes', 'x86/headers' and 'x86/minor-fixes' into x86/core
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -199,6 +199,10 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
	return __va(phys_addr);
	return __va(phys_addr);
}
}


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

/* --------------------------------------------------------------------------
/* --------------------------------------------------------------------------
                            Boot-time Table Parsing
                            Boot-time Table Parsing
   -------------------------------------------------------------------------- */
   -------------------------------------------------------------------------- */
Loading