lkml.org 
[lkml]   [2009]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/1] intel_txt: to fix build errors of CONFIG_ACPI_SLEEP

* Wang, Shane <shane.wang@intel.com> wrote:

> Signed-off-by: Shane Wang <shane.wang@intel.com>
>
> diff -r 7358cf1b3090 arch/x86/kernel/tboot.c
> --- a/arch/x86/kernel/tboot.c Wed Aug 12 03:04:23 2009 -0700
> +++ b/arch/x86/kernel/tboot.c Wed Aug 12 18:06:21 2009 -0700
> @@ -169,6 +169,7 @@ void tboot_create_trampoline(void)
>
> static void set_mac_regions(void)
> {
> +#ifdef CONFIG_ACPI_SLEEP
> tboot->num_mac_regions = 3;
> /* S3 resume code */
> tboot->mac_regions[0].start = PFN_PHYS(PFN_DOWN(acpi_wakeup_address));
> @@ -181,6 +182,7 @@ static void set_mac_regions(void)
> tboot->mac_regions[2].start = PFN_PHYS(PFN_DOWN(virt_to_phys(&_text)));
> tboot->mac_regions[2].size = PFN_PHYS(PFN_UP(virt_to_phys(&_end))) -
> PFN_PHYS(PFN_DOWN(virt_to_phys(&_text)));
> +#endif

These #ifdefs are quite ugly. Why not add a 'depends on ACPI_SLEEP'
rule to the INTEL_TXT Kconfig section?

Also, instead of:

+ depends on EXPERIMENTAL && X86 && DMAR && ACPI

Please change the X86 to HAVE_INTEL_TXT, provide that Kconfig option
(non-interactive) and select HAVE_INTEL_TXT from arch/x86/Kconfig,
via a line like this:

select HAVE_INTEL_TXT if DMAR && ACPI_SLEEP

Thanks,

Ingo


\
 
 \ /
  Last update: 2009-08-13 08:49    [W:0.112 / U:0.456 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site