From 3091080ef7724ddac77e0ae81c270936a630477f Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 15 Feb 2017 18:04:58 +0000
Subject: [PATCH] xen/include: Include xen/kconfig.h automatically

generated/autoconf.h is already included automatically so CONFIG_* defines are
available.  However, the companion macros such as IS_ENABLED() are not
included.

Include them uniformly everywhere.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Julien Grall <julien.grall@arm.com>
---
 xen/drivers/acpi/osl.c            | 1 -
 xen/include/asm-arm/alternative.h | 1 -
 xen/include/xen/config.h          | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index f75dfb7cc7..94dbf0406f 100644
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -37,7 +37,6 @@
 #include <xen/domain_page.h>
 #include <xen/efi.h>
 #include <xen/vmap.h>
-#include <xen/kconfig.h>
 
 #define _COMPONENT		ACPI_OS_SERVICES
 ACPI_MODULE_NAME("osl")
diff --git a/xen/include/asm-arm/alternative.h b/xen/include/asm-arm/alternative.h
index c9740b8162..6cc9d0dc5f 100644
--- a/xen/include/asm-arm/alternative.h
+++ b/xen/include/asm-arm/alternative.h
@@ -2,7 +2,6 @@
 #define __ASM_ALTERNATIVE_H
 
 #include <asm/cpufeature.h>
-#include <xen/kconfig.h>
 
 #ifdef CONFIG_HAS_ALTERNATIVE
 
diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index 473c5e8c3e..9f39687fab 100644
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -7,7 +7,7 @@
 #ifndef __XEN_CONFIG_H__
 #define __XEN_CONFIG_H__
 
-#include <generated/autoconf.h>
+#include <xen/kconfig.h>
 
 #ifndef __ASSEMBLY__
 #include <xen/compiler.h>
-- 
2.30.2