xen: remove CONFIG_PAGING_ASSISTANCE

Arm should always set it, while on x86 xen can't build with it set to
0, which means people haven't used it for years.

Remove it and simplify xen/paging.h.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Julien Grall <julien.grall@arm.com>

diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index 7da94698e1f3a291c10fed5665b765b28221b09d..210c9f858bfa2635112c847942e5c36e65639d1a 100644 (file)
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -24,8 +24,6 @@
 /* xen_ulong_t is always 64 bits */
 #define BITS_PER_XEN_ULONG 64
 
-#define CONFIG_PAGING_ASSISTANCE 1
-
 #define CONFIG_PAGING_LEVELS 3
 
 #define CONFIG_ARM 1

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 0130ac864fc6bbf1c24cf071d590ccc9265ee39c..f63a9cb952db0856c4419ec2146dcb49dbe9335f 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -19,7 +19,6 @@
 
 #define BITS_PER_XEN_ULONG BITS_PER_LONG
 
-#define CONFIG_PAGING_ASSISTANCE 1
 #define CONFIG_X86_PM_TIMER 1
 #define CONFIG_HPET_TIMER 1
 #define CONFIG_X86_MCE_THERMAL 1

diff --git a/xen/include/xen/paging.h b/xen/include/xen/paging.h
index 214bde5576f32719cd0143e7fc8e63a62afda8f6..a126c9bf58d78a73b57902b84f290263812dda83 100644 (file)
--- a/xen/include/xen/paging.h
+++ b/xen/include/xen/paging.h
@@ -1,26 +1,7 @@
-
 #ifndef __XEN_PAGING_H__
 #define __XEN_PAGING_H__
 
-#if defined CONFIG_PAGING_ASSISTANCE
-
 #include <asm/paging.h>
 #include <asm/p2m.h>
 
-#elif defined CONFIG_SHADOW_PAGING
-
-#include <asm/shadow.h>
-
-#define paging_mode_translate(d)  shadow_mode_translate(d)
-#define paging_mode_external(d)   (0)
-
-#else
-
-#define paging_mode_translate(d)              (0)
-#define paging_mode_external(d)               (0)
-#define guest_physmap_add_page(d, p, m, o)    ((void)0)
-#define guest_physmap_remove_page(d, p, m, o) ((void)0)
-
-#endif
-
 #endif /* __XEN_PAGING_H__ */