linux-kernel - Re: [PATCH 1/1] intel_txt: to fix build errors of CONFIG_ACPI

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20090813064634.GA12143@elte.hu>
Date:	Thu, 13 Aug 2009 08:46:34 +0200
From:	Ingo Molnar <mingo@...e.hu>
To:	"Wang, Shane" <shane.wang@...el.com>
Cc:	"Cihula, Joseph" <joseph.cihula@...el.com>,
	"H. Peter Anvin" <hpa@...or.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"arjan@...ux.intel.com" <arjan@...ux.intel.com>,
	"andi@...stfloor.org" <andi@...stfloor.org>,
	"chrisw@...s-sol.org" <chrisw@...s-sol.org>,
	"jmorris@...ei.org" <jmorris@...ei.org>,
	"jbeulich@...ell.com" <jbeulich@...ell.com>,
	"peterm@...hat.com" <peterm@...hat.com>,
	"Wei, Gang" <gang.wei@...el.com>
Subject: Re: [PATCH 1/1] intel_txt: to fix build errors of CONFIG_ACPI_SLEEP


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

> Signed-off-by: Shane Wang <shane.wang@...el.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/