Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1160429

[Patch V4 16/16] xen: remove no longer needed p2m.h

Show all headers | View raw

Cleanup by removing arch/x86/xen/p2m.h as it isn't needed any more.

Most definitions in this file are used in p2m.c only. Move those into
p2m.c.

set_phys_range_identity() is already declared in
arch/x86/include/asm/xen/page.h, add __init annotation there.

MAX_REMAP_RANGES isn't used at all, just delete it.

The only define left is P2M_PER_PAGE which is moved to page.h as well.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 arch/x86/include/asm/xen/page.h |  6 ++++--
 arch/x86/xen/p2m.c              |  6 +++++-
 arch/x86/xen/p2m.h              | 15 ---------------
 arch/x86/xen/setup.c            |  1 -
 4 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 arch/x86/xen/p2m.h

diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 10ef14b..a3804fb 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -35,6 +35,8 @@ typedef struct xpaddr {
 #define FOREIGN_FRAME(m)	((m) | FOREIGN_FRAME_BIT)
 #define IDENTITY_FRAME(m)	((m) | IDENTITY_FRAME_BIT)
 
+#define P2M_PER_PAGE		(PAGE_SIZE / sizeof(unsigned long))
+
 extern unsigned long *machine_to_phys_mapping;
 extern unsigned long  machine_to_phys_nr;
 extern unsigned long *xen_p2m_addr;
@@ -44,8 +46,8 @@ extern unsigned long  xen_max_p2m_pfn;
 extern unsigned long get_phys_to_machine(unsigned long pfn);
 extern bool set_phys_to_machine(unsigned long pfn, unsigned long mfn);
 extern bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);
-extern unsigned long set_phys_range_identity(unsigned long pfn_s,
-					     unsigned long pfn_e);
+extern unsigned long __init set_phys_range_identity(unsigned long pfn_s,
+						    unsigned long pfn_e);
 
 extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
 				   struct gnttab_map_grant_ref *kmap_ops,
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index 365a64a..1f63ad2 100644
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -78,10 +78,14 @@
 #include <xen/balloon.h>
 #include <xen/grant_table.h>
 
-#include "p2m.h"
 #include "multicalls.h"
 #include "xen-ops.h"
 
+#define P2M_MID_PER_PAGE	(PAGE_SIZE / sizeof(unsigned long *))
+#define P2M_TOP_PER_PAGE	(PAGE_SIZE / sizeof(unsigned long **))
+
+#define MAX_P2M_PFN	(P2M_TOP_PER_PAGE * P2M_MID_PER_PAGE * P2M_PER_PAGE)
+
 #define PMDS_PER_MID_PAGE	(P2M_MID_PER_PAGE / PTRS_PER_PTE)
 
 unsigned long *xen_p2m_addr __read_mostly;
diff --git a/arch/x86/xen/p2m.h b/arch/x86/xen/p2m.h
deleted file mode 100644
index ad8aee2..0000000
--- a/arch/x86/xen/p2m.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XEN_P2M_H
-#define _XEN_P2M_H
-
-#define P2M_PER_PAGE        (PAGE_SIZE / sizeof(unsigned long))
-#define P2M_MID_PER_PAGE    (PAGE_SIZE / sizeof(unsigned long *))
-#define P2M_TOP_PER_PAGE    (PAGE_SIZE / sizeof(unsigned long **))
-
-#define MAX_P2M_PFN         (P2M_TOP_PER_PAGE * P2M_MID_PER_PAGE * P2M_PER_PAGE)
-
-#define MAX_REMAP_RANGES    10
-
-extern unsigned long __init set_phys_range_identity(unsigned long pfn_s,
-                                      unsigned long pfn_e);
-
-#endif  /* _XEN_P2M_H */
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index f960021..a1a77ea 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -30,7 +30,6 @@
 #include <xen/hvc-console.h>
 #include "xen-ops.h"
 #include "vdso.h"
-#include "p2m.h"
 #include "mmu.h"
 
 #define GB(x) ((uint64_t)(x) * 1024 * 1024 * 1024)
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[Patch V4 00/16] xen: support pv-domains larger than 512GB Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 06/16] xen: split counting of extra memory pages from remapping Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 11/16] xen: check for initrd conflicting with e820 map Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 09/16] xen: check for kernel memory conflicting with memory layout Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 01/16] xen: sync with xen headers Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 16/16] xen: remove no longer needed p2m.h Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 14/16] xen: move p2m list if conflicting with e820 map Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
    Re: [Xen-devel] [Patch V4 14/16] xen: move p2m list if conflicting  with e820 map David Vrabel <david.vrabel@citrix.com> - 2015-06-11 13:10 +0200
  [Patch V4 07/16] xen: check memory area against e820 map Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 10/16] xen: check pre-allocated page tables for conflict with memory map Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 15/16] xen: allow more than 512 GB of RAM for 64 bit pv-domains Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 02/16] xen: save linear p2m list address in shared info structure Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 08/16] xen: find unused contiguous memory area Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 13/16] xen: add explicit memblock_reserve() calls for special pages Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200
  [Patch V4 12/16] mm: provide early_memremap_ro to establish read-only mapping Juergen Gross <jgross@suse.com> - 2015-06-08 14:10 +0200

csiph-web