Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb3eb850 authored by Juergen Gross's avatar Juergen Gross Committed by David Vrabel
Browse files

xen: remove no longer needed p2m.h 



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: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarKonrad Rzeszutek Wilk <Konrad.wilk@oracle.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent c70727a5

arch/x86/include/asm/xen/page.h

+4 −2
Original line number Diff line number Diff line
@@ -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,7 +46,7 @@ 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,

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,

arch/x86/xen/p2m.c

+5 −1
Original line number Diff line number Diff line
@@ -79,10 +79,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;

arch/x86/xen/p2m.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#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 */

arch/x86/xen/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -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)