From b5a5641ae58a210e825baeba27a6c460e34e89cd Mon Sep 17 00:00:00 2001
From: Julien Grall <julien.grall@linaro.org>
Date: Tue, 14 Jan 2014 01:41:13 +0000
Subject: [PATCH 05/48] xen: Remove duplicate features.h header in i386 arch

---
 sys/amd64/include/xen/xenpmap.h |  2 +-
 sys/i386/include/xen/features.h | 22 ----------------------
 sys/i386/include/xen/xenvar.h   |  2 +-
 sys/i386/xen/xen_machdep.c      |  2 +-
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 sys/i386/include/xen/features.h

diff --git a/sys/amd64/include/xen/xenpmap.h b/sys/amd64/include/xen/xenpmap.h
index d768dad..0d59020 100644
--- a/sys/amd64/include/xen/xenpmap.h
+++ b/sys/amd64/include/xen/xenpmap.h
@@ -34,7 +34,7 @@
 #ifndef _XEN_XENPMAP_H_
 #define _XEN_XENPMAP_H_
 
-#include <machine/xen/features.h>
+#include <xen/features.h>
 
 void _xen_queue_pt_update(vm_paddr_t, vm_paddr_t, char *, int);
 void xen_pt_switch(vm_paddr_t);
diff --git a/sys/i386/include/xen/features.h b/sys/i386/include/xen/features.h
deleted file mode 100644
index fb4f680..0000000
--- a/sys/i386/include/xen/features.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * features.h
- *
- * Query the features reported by Xen.
- *
- * Copyright (c) 2006, Ian Campbell
- *
- * $FreeBSD$
- */
-
-#ifndef __ASM_XEN_FEATURES_H__
-#define __ASM_XEN_FEATURES_H__
-
-#include <xen/interface/version.h>
-
-extern void setup_xen_features(void);
-
-extern uint8_t xen_features[XENFEAT_NR_SUBMAPS * 32];
-
-#define xen_feature(flag)	(xen_features[flag])
-
-#endif /* __ASM_XEN_FEATURES_H__ */
diff --git a/sys/i386/include/xen/xenvar.h b/sys/i386/include/xen/xenvar.h
index 5694607..81e906d 100644
--- a/sys/i386/include/xen/xenvar.h
+++ b/sys/i386/include/xen/xenvar.h
@@ -29,7 +29,7 @@
 #ifndef XENVAR_H_
 #define XENVAR_H_
 
-#include <machine/xen/features.h>
+#include <xen/features.h>
 
 #if defined(XEN)
 
diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c
index dbaa7ad..2d9cb55 100644
--- a/sys/i386/xen/xen_machdep.c
+++ b/sys/i386/xen/xen_machdep.c
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/xen/xenpmap.h>
 #include <machine/xen/xenfunc.h>
 #include <xen/interface/memory.h>
-#include <machine/xen/features.h>
+#include <xen/features.h>
 #ifdef SMP
 #include <machine/privatespace.h>
 #endif
-- 
2.1.0