From: Juergen Gross <jgross@suse.com> To: xen-devel@lists.xensource.com, konrad.wilk@oracle.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Juergen Gross <jgross@suse.com> Subject: [RESEND Patch V3 15/15] xen: remove no longer needed p2m.h Date: Mon, 4 May 2015 10:23:15 +0200 [thread overview] Message-ID: <1430727795-25133-16-git-send-email-jgross@suse.com> (raw) In-Reply-To: <1430727795-25133-1-git-send-email-jgross@suse.com> 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 18a11f2..b858592 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
WARNING: multiple messages have this Message-ID (diff)
From: Juergen Gross <jgross@suse.com> To: xen-devel@lists.xensource.com, konrad.wilk@oracle.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Juergen Gross <jgross@suse.com> Subject: [RESEND Patch V3 15/15] xen: remove no longer needed p2m.h Date: Mon, 4 May 2015 10:23:15 +0200 [thread overview] Message-ID: <1430727795-25133-16-git-send-email-jgross@suse.com> (raw) In-Reply-To: <1430727795-25133-1-git-send-email-jgross@suse.com> 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 18a11f2..b858592 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-05-04 8:25 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-04 8:23 [RESEND Patch V3 00/15] xen: support pv-domains larger than 512GB Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 01/15] xen: sync with xen headers Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 02/15] xen: save linear p2m list address in shared info structure Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 03/15] xen: don't build mfn tree if tools don't need it Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 04/15] xen: eliminate scalability issues from initial mapping setup Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 05/15] xen: move static e820 map to global scope Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 06/15] xen: split counting of extra memory pages from remapping Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 07/15] xen: check memory area against e820 map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 08/15] xen: find unused contiguous memory area Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 09/15] xen: check for kernel memory conflicting with memory layout Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 10/15] xen: check pre-allocated page tables for conflict with memory map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 11/15] xen: check for initrd conflicting with e820 map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 12/15] mm: provide early_memremap_ro to establish read-only mapping Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 13/15] xen: move p2m list if conflicting with e820 map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 14/15] xen: allow more than 512 GB of RAM for 64 bit pv-domains Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` Juergen Gross [this message] 2015-05-04 8:23 ` [RESEND Patch V3 15/15] xen: remove no longer needed p2m.h Juergen Gross 2015-05-15 12:17 ` [RESEND Patch V3 00/15] xen: support pv-domains larger than 512GB Juergen Gross 2015-05-15 12:17 ` Juergen Gross -- strict thread matches above, loose matches on Subject: below -- 2015-05-04 6:18 Juergen Gross 2015-05-04 6:19 ` [RESEND Patch V3 15/15] xen: remove no longer needed p2m.h Juergen Gross 2015-05-04 6:19 ` Juergen Gross
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1430727795-25133-16-git-send-email-jgross@suse.com \ --to=jgross@suse.com \ --cc=boris.ostrovsky@oracle.com \ --cc=david.vrabel@citrix.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=xen-devel@lists.xensource.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.