WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] x86: convert frame_table to a #define

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] x86: convert frame_table to a #define
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 07 Sep 2009 01:05:18 -0700
Delivery-date: Mon, 07 Sep 2009 01:05:42 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1252309260 -3600
# Node ID 9dc39a86a3966483dfafcded2d9fdb979dab22bd
# Parent  27e298295d68d2ddf0f9d9d07b86c2098e2ad217
x86: convert frame_table to a #define

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/mm.c        |    5 +----
 xen/common/kexec.c       |    7 +++++++
 xen/include/asm-x86/mm.h |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff -r 27e298295d68 -r 9dc39a86a396 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Mon Sep 07 08:40:33 2009 +0100
+++ b/xen/arch/x86/mm.c Mon Sep 07 08:41:00 2009 +0100
@@ -137,8 +137,7 @@ l1_pgentry_t __attribute__ ((__section__
 /* Private domain structs for DOMID_XEN and DOMID_IO. */
 struct domain *dom_xen, *dom_io;
 
-/* Frame table and its size in pages. */
-struct page_info *__read_mostly frame_table;
+/* Frame table size in pages. */
 unsigned long max_page;
 unsigned long total_pages;
 
@@ -166,8 +165,6 @@ void __init init_frametable(void)
 void __init init_frametable(void)
 {
     unsigned long nr_pages, page_step, i, mfn;
-
-    frame_table = (struct page_info *)FRAMETABLE_VIRT_START;
 
     nr_pages  = PFN_UP(max_page * sizeof(*frame_table));
     page_step = 1 << (cpu_has_page1gb ? L3_PAGETABLE_SHIFT - PAGE_SHIFT
diff -r 27e298295d68 -r 9dc39a86a396 xen/common/kexec.c
--- a/xen/common/kexec.c        Mon Sep 07 08:40:33 2009 +0100
+++ b/xen/common/kexec.c        Mon Sep 07 08:41:00 2009 +0100
@@ -338,7 +338,14 @@ static void crash_save_vmcoreinfo(void)
     VMCOREINFO_PAGESIZE(PAGE_SIZE);
 
     VMCOREINFO_SYMBOL(domain_list);
+#ifndef frame_table
     VMCOREINFO_SYMBOL(frame_table);
+#else
+    {
+        static const void *const _frame_table = frame_table;
+        VMCOREINFO_SYMBOL_ALIAS(frame_table, _frame_table);
+    }
+#endif
     VMCOREINFO_SYMBOL(max_page);
 
     VMCOREINFO_STRUCT_SIZE(page_info);
diff -r 27e298295d68 -r 9dc39a86a396 xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h  Mon Sep 07 08:40:33 2009 +0100
+++ b/xen/include/asm-x86/mm.h  Mon Sep 07 08:41:00 2009 +0100
@@ -259,7 +259,7 @@ extern void share_xen_page_with_privileg
 extern void share_xen_page_with_privileged_guests(
     struct page_info *page, int readonly);
 
-extern struct page_info *frame_table;
+#define frame_table ((struct page_info *)FRAMETABLE_VIRT_START)
 extern unsigned long max_page;
 extern unsigned long total_pages;
 void init_frametable(void);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] x86: convert frame_table to a #define, Xen patchbot-unstable <=