Commit e86cdc80 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'fix-ia64-build-for-v6.6' of... 

Merge tag 'fix-ia64-build-for-v6.6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ardb/linux

Merge an ia64 ACPI build fix for v6.6 from Ard Biesheuvel:

"Build fix for Itanium/ia64:

 - provide dummy implementation of acpi_proc_quirk_mwait_check() which
   was moved out of generic code into arch/x86, breaking the ia64 build"

* tag 'fix-ia64-build-for-v6.6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ardb/linux:
  acpi: Provide ia64 dummy implementation of acpi_proc_quirk_mwait_check()
parents ce9ecca0 a0334bf7

arch/ia64/kernel/acpi.c

+4 −0
Original line number Diff line number Diff line
@@ -907,3 +907,7 @@ EXPORT_SYMBOL(acpi_unregister_ioapic); 
 * TBD when IA64 starts to support suspend...

 */

int acpi_suspend_lowlevel(void) { return 0; }



void acpi_proc_quirk_mwait_check(void)

{

}