diff options
35 files changed, 2 insertions, 41 deletions
diff --git a/xen/Rules.mk b/xen/Rules.mk index 59c7dd7577..37c6a79987 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -41,7 +41,7 @@ ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o -CFLAGS-y += -g -D__XEN__ +CFLAGS-y += -g -D__XEN__ --include $(BASEDIR)/include/xen/config.h CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c CFLAGS-$(FLASK_ENABLE) += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS @@ -59,7 +59,7 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif -AFLAGS-y += -D__ASSEMBLY__ +AFLAGS-y += -D__ASSEMBLY__ --include $(BASEDIR)/include/xen/config.h # Clang's built-in assembler can't handle .code16/.code32/.code64 yet AFLAGS-$(clang) += -no-integrated-as diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index a8cd593d23..56fe602adf 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -3,7 +3,6 @@ #ifndef __ASSEMBLY__ -#include <xen/config.h> #include <xen/lib.h> #include <xen/types.h> #include <xen/bitops.h> diff --git a/xen/include/xen/byteorder/swab.h b/xen/include/xen/byteorder/swab.h index 0193ff83e7..b7e30f0503 100644 --- a/xen/include/xen/byteorder/swab.h +++ b/xen/include/xen/byteorder/swab.h @@ -10,8 +10,6 @@ * to clean up support for bizarre-endian architectures. */ -#include <xen/compiler.h> - /* casts are necessary for constants, because we never know how for sure * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way. */ diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index f972dc30d4..6ee174efa4 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -1,7 +1,6 @@ #ifndef __LINUX_CACHE_H #define __LINUX_CACHE_H -#include <xen/config.h> #include <asm/cache.h> #ifndef L1_CACHE_ALIGN diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index c78095cb63..857cbc77c8 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -5,8 +5,6 @@ #ifndef __XEN_COMPAT_H__ #define __XEN_COMPAT_H__ -#include <xen/config.h> - #ifdef CONFIG_COMPAT #include <xen/types.h> diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h index db53948663..1aa1412d89 100644 --- a/xen/include/xen/cpumask.h +++ b/xen/include/xen/cpumask.h @@ -75,7 +75,6 @@ * inside a macro, the way we do the other calls. */ -#include <xen/config.h> #include <xen/bitmap.h> #include <xen/kernel.h> diff --git a/xen/include/xen/ctype.h b/xen/include/xen/ctype.h index f6520e7194..6dec944a37 100644 --- a/xen/include/xen/ctype.h +++ b/xen/include/xen/ctype.h @@ -1,8 +1,6 @@ #ifndef _LINUX_CTYPE_H #define _LINUX_CTYPE_H -#include <xen/config.h> - /* * NOTE! This ctype does not handle EOF like the standard C * library is required to. diff --git a/xen/include/xen/domain_page.h b/xen/include/xen/domain_page.h index a7df10b1ad..9feddae84c 100644 --- a/xen/include/xen/domain_page.h +++ b/xen/include/xen/domain_page.h @@ -9,7 +9,6 @@ #ifndef __XEN_DOMAIN_PAGE_H__ #define __XEN_DOMAIN_PAGE_H__ -#include <xen/config.h> #include <xen/mm.h> #ifdef CONFIG_DOMAIN_PAGE diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 7e5ad7b9d2..232d50e06d 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -9,7 +9,6 @@ #ifndef __XEN_EVENT_H__ #define __XEN_EVENT_H__ -#include <xen/config.h> #include <xen/sched.h> #include <xen/smp.h> #include <xen/softirq.h> diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index c161705ca9..80817608b6 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -24,7 +24,6 @@ #ifndef __XEN_GRANT_TABLE_H__ #define __XEN_GRANT_TABLE_H__ -#include <xen/config.h> #include <public/grant_table.h> #include <asm/grant_table.h> diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 3d099a65cd..73b1598cac 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -5,7 +5,6 @@ #ifndef __XEN_HYPERCALL_H__ #define __XEN_HYPERCALL_H__ -#include <xen/config.h> #include <xen/types.h> #include <xen/time.h> #include <public/xen.h> diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index 220d464fc7..f7a7dc4d9d 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -1,7 +1,6 @@ #ifndef _LINUX_INIT_H #define _LINUX_INIT_H -#include <xen/config.h> #include <asm/init.h> /* diff --git a/xen/include/xen/inttypes.h b/xen/include/xen/inttypes.h index 2163244326..e90c55f120 100644 --- a/xen/include/xen/inttypes.h +++ b/xen/include/xen/inttypes.h @@ -23,7 +23,6 @@ #ifndef _XEN_INTTYPES_H #define _XEN_INTTYPES_H 1 -#include <xen/config.h> #include <xen/types.h> # if BITS_PER_LONG == 64 diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index a2a90e1a34..7afc64ab26 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -1,7 +1,6 @@ #ifndef __XEN_IRQ_H__ #define __XEN_IRQ_H__ -#include <xen/config.h> #include <xen/cpumask.h> #include <xen/rcupdate.h> #include <xen/spinlock.h> diff --git a/xen/include/xen/irq_cpustat.h b/xen/include/xen/irq_cpustat.h index 94957996bb..73629f6ec8 100644 --- a/xen/include/xen/irq_cpustat.h +++ b/xen/include/xen/irq_cpustat.h @@ -9,7 +9,6 @@ * Keith Owens <kaos@ocs.com.au> July 2000. */ -#include <xen/config.h> #include <asm/hardirq.h> /* diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 3e3a0caf8b..c8cd9fca0e 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -3,7 +3,6 @@ #include <xen/inttypes.h> #include <xen/stdarg.h> -#include <xen/config.h> #include <xen/types.h> #include <xen/xmalloc.h> #include <xen/string.h> diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 63c47099f7..cea95b27f8 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -28,7 +28,6 @@ #ifndef __XEN_MM_H__ #define __XEN_MM_H__ -#include <xen/config.h> #include <xen/types.h> #include <xen/list.h> #include <xen/spinlock.h> diff --git a/xen/include/xen/notifier.h b/xen/include/xen/notifier.h index e9519e2f76..d1ff9b199a 100644 --- a/xen/include/xen/notifier.h +++ b/xen/include/xen/notifier.h @@ -10,7 +10,6 @@ #ifndef __XEN_NOTIFIER_H__ #define __XEN_NOTIFIER_H__ -#include <xen/config.h> #include <xen/types.h> #include <xen/errno.h> #include <xen/kernel.h> diff --git a/xen/include/xen/numa.h b/xen/include/xen/numa.h index 2be38349b5..ac4b391d3a 100644 --- a/xen/include/xen/numa.h +++ b/xen/include/xen/numa.h @@ -1,7 +1,6 @@ #ifndef _XEN_NUMA_H #define _XEN_NUMA_H -#include <xen/config.h> #include <asm/numa.h> #ifndef NODES_SHIFT diff --git a/xen/include/xen/paging.h b/xen/include/xen/paging.h index abe276d049..213ece43aa 100644 --- a/xen/include/xen/paging.h +++ b/xen/include/xen/paging.h @@ -2,8 +2,6 @@ #ifndef __XEN_PAGING_H__ #define __XEN_PAGING_H__ -#include <xen/config.h> - #if defined CONFIG_PAGING_ASSISTANCE #include <asm/paging.h> diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 0e0d1042e1..759f1aacf7 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -7,7 +7,6 @@ #ifndef __XEN_PCI_H__ #define __XEN_PCI_H__ -#include <xen/config.h> #include <xen/types.h> #include <xen/list.h> #include <xen/spinlock.h> diff --git a/xen/include/xen/percpu.h b/xen/include/xen/percpu.h index 9366d18750..abe0b1187f 100644 --- a/xen/include/xen/percpu.h +++ b/xen/include/xen/percpu.h @@ -1,7 +1,6 @@ #ifndef __XEN_PERCPU_H__ #define __XEN_PERCPU_H__ -#include <xen/config.h> #include <asm/percpu.h> /* diff --git a/xen/include/xen/preempt.h b/xen/include/xen/preempt.h index f4228058e5..fd02ada12b 100644 --- a/xen/include/xen/preempt.h +++ b/xen/include/xen/preempt.h @@ -9,7 +9,6 @@ #ifndef __XEN_PREEMPT_H__ #define __XEN_PREEMPT_H__ -#include <xen/config.h> #include <xen/types.h> #include <xen/percpu.h> diff --git a/xen/include/xen/radix-tree.h b/xen/include/xen/radix-tree.h index 15d88a2844..faf25453a3 100644 --- a/xen/include/xen/radix-tree.h +++ b/xen/include/xen/radix-tree.h @@ -20,7 +20,6 @@ #ifndef _XEN_RADIX_TREE_H #define _XEN_RADIX_TREE_H -#include <xen/config.h> #include <xen/types.h> #include <xen/lib.h> #include <xen/rcupdate.h> diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 3904afe7e5..6441546401 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -2,7 +2,6 @@ #ifndef __SCHED_H__ #define __SCHED_H__ -#include <xen/config.h> #include <xen/types.h> #include <xen/spinlock.h> #include <xen/shared.h> diff --git a/xen/include/xen/shared.h b/xen/include/xen/shared.h index 528c8b77c5..19c79fdf58 100644 --- a/xen/include/xen/shared.h +++ b/xen/include/xen/shared.h @@ -1,8 +1,6 @@ #ifndef __XEN_SHARED_H__ #define __XEN_SHARED_H__ -#include <xen/config.h> - #ifdef CONFIG_COMPAT #include <compat/xen.h> diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h index 536c229d45..e05f3903ab 100644 --- a/xen/include/xen/smp.h +++ b/xen/include/xen/smp.h @@ -1,7 +1,6 @@ #ifndef __XEN_SMP_H__ #define __XEN_SMP_H__ -#include <xen/config.h> #include <asm/smp.h> /* diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index 14c003db2f..193351deff 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -11,7 +11,6 @@ enum { NR_COMMON_SOFTIRQS }; -#include <xen/config.h> #include <xen/lib.h> #include <xen/smp.h> #include <asm/bitops.h> diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index f1506c1ecb..2df4452709 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -1,7 +1,6 @@ #ifndef __SPINLOCK_H__ #define __SPINLOCK_H__ -#include <xen/config.h> #include <asm/system.h> #include <asm/spinlock.h> diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h index 082d707469..5215b9a697 100644 --- a/xen/include/xen/symbols.h +++ b/xen/include/xen/symbols.h @@ -1,7 +1,6 @@ #ifndef _XEN_SYMBOLS_H #define _XEN_SYMBOLS_H -#include <xen/config.h> #include <xen/types.h> #define KSYM_NAME_LEN 127 diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 76ab44069e..5529b14dbd 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -9,7 +9,6 @@ #ifndef __XEN_TMEM_XEN_H__ #define __XEN_TMEM_XEN_H__ -#include <xen/config.h> #include <xen/mm.h> /* heap alloc/free */ #include <xen/xmalloc.h> /* xmalloc/xfree */ #include <xen/sched.h> /* struct domain */ diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index f16b3d5c06..b32f6c5803 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -23,7 +23,6 @@ extern int tb_init_done; -#include <xen/config.h> #include <public/sysctl.h> #include <public/trace.h> #include <asm/trace.h> diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index fd89c98427..ac9664799d 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -1,7 +1,6 @@ #ifndef __TYPES_H__ #define __TYPES_H__ -#include <xen/config.h> #include <asm/types.h> #define BITS_TO_LONGS(bits) \ diff --git a/xen/include/xen/vga.h b/xen/include/xen/vga.h index 04100778e1..cc690b9ba2 100644 --- a/xen/include/xen/vga.h +++ b/xen/include/xen/vga.h @@ -9,7 +9,6 @@ #ifndef _XEN_VGA_H #define _XEN_VGA_H -#include <xen/config.h> #include <public/xen.h> #ifdef CONFIG_VGA diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index df4c842bbf..845ea86011 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -10,7 +10,6 @@ #ifndef __XEN_XENOPROF_H__ #define __XEN_XENOPROF_H__ -#include <xen/config.h> #include <xen/inttypes.h> #include <public/xenoprof.h> #include <asm/xenoprof.h> |