I am not really sure if these patches should go through the ACPI or x86 tree. I think they are more x86-ish related and earlier patches for tboot went through tip.. Thoughts? Theset two patches cleanup the ACPI code by removing the 'tboot_sleep' function call within the ACPI call and instead use a function call. The function call is set if Intel TXT is detected, otherwise we just skip over and continue on in hwsleep.c. Tested on AMD, Intel w/TXT and w/o TXT. Also compile tested on IA64 which has some reference to tboot but does not use it. The diff-stat: arch/x86/kernel/tboot.c | 9 ++++++--- drivers/acpi/acpica/hwsleep.c | 10 +++++++--- drivers/acpi/osl.c | 24 ++++++++++++++++++++++++ include/acpi/acexcep.h | 1 + include/linux/acpi.h | 10 ++++++++++ include/linux/tboot.h | 1 - 6 files changed, 48 insertions(+), 7 deletions(-) The purpose of this cleanup is two-fold: 1). Cleanup the call a bit - that 'tboot_sleep' in ACPICA, which is suppose to be OS-agnostic code looks odd. 2). Piggy-back on the function call if running under Xen [https://lkml.org/lkml/2011/12/16/447]. Those patches are still going through review, but the cleanup patches can be submitted as standalone. Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html