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] [IA64] fix compilation error caused by 19

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] [IA64] fix compilation error caused by 19286:dd489125a2e7
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 09 Mar 2009 04:30:15 -0700
Delivery-date: Mon, 09 Mar 2009 04:30:55 -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 1236590382 0
# Node ID c4760d58ee6f859eda3b9650fa9bf556c53a1d92
# Parent  455720d735c7531fe432333d728c3f7f37a082eb
[IA64] fix compilation error caused by 19286:dd489125a2e7

This patch fixes compilation error caused by 19286:dd489125a2e7

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/xen/xensetup.c |    6 ++++++
 xen/include/asm-ia64/mm.h    |   23 ++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff -r 455720d735c7 -r c4760d58ee6f xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c      Mon Mar 09 09:19:10 2009 +0000
+++ b/xen/arch/ia64/xen/xensetup.c      Mon Mar 09 09:19:42 2009 +0000
@@ -337,6 +337,8 @@ static int __initdata dom0_vhpt_size_log
 static int __initdata dom0_vhpt_size_log2;
 integer_param("dom0_vhpt_size_log2", dom0_vhpt_size_log2);
 #endif
+unsigned long xen_fixed_mfn_start __read_mostly;
+unsigned long xen_fixed_mfn_end __read_mostly;
 
 void __init start_kernel(void)
 {
@@ -556,6 +558,10 @@ skip_move:
            (xenheap_phys_end-__pa(xen_heap_start)) >> 20,
            (xenheap_phys_end-__pa(xen_heap_start)) >> 10);
 
+    /* for is_xen_fixed_mfn() */
+    xen_fixed_mfn_start = virt_to_mfn(&_start);
+    xen_fixed_mfn_end = virt_to_mfn(xen_heap_start);
+
     end_boot_allocator();
 
     softirq_init();
diff -r 455720d735c7 -r c4760d58ee6f xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h Mon Mar 09 09:19:10 2009 +0000
+++ b/xen/include/asm-ia64/mm.h Mon Mar 09 09:19:42 2009 +0000
@@ -149,13 +149,34 @@ page_list_splice_init(struct page_list_h
 # define PGC_xen_heap     PG_mask(1, 2)
  /* bit PG_shift(3) reserved. See asm-x86/mm.h */
  /* PG_mask(7, 6) reserved. See asm-x86/mm.h*/
+
+ /* Page is broken? */
+#define _PGC_broken       PG_shift(7)
+#define PGC_broken        PG_mask(1, 7)
+ /* Page is offline pending ? */
+#define _PGC_offlining    PG_shift(8)
+#define PGC_offlining     PG_mask(1, 8)
+ /* Page is offlined */
+#define _PGC_offlined     PG_shift(9)
+#define PGC_offlined      PG_mask(1, 9)
+#define PGC_offlined_broken (PGC_offlined | PGC_broken)
+
+#define is_page_offlining(page) ((page)->count_info & PGC_offlining)
+#define is_page_offlined(page)  ((page)->count_info & PGC_offlined)
+#define is_page_broken(page)    ((page)->count_info & PGC_broken)
+#define is_page_online(page)    (!is_page_offlined(page))
+
  /* Count of references to this frame. */
-#define PGC_count_width   PG_shift(6)
+#define PGC_count_width   PG_shift(9)
 #define PGC_count_mask    ((1UL<<PGC_count_width)-1)
 
+extern unsigned long xen_fixed_mfn_start;
+extern unsigned long xen_fixed_mfn_end;
 #define is_xen_heap_page(page)  ((page)->count_info & PGC_xen_heap)
 #define is_xen_heap_mfn(mfn)    (mfn_valid(mfn) &&                      \
                                  is_xen_heap_page(mfn_to_page(mfn)))
+#define is_xen_fixed_mfn(mfn)                                           \
+    (xen_fixed_mfn_start <= (mfn) && (mfn) <= xen_fixed_mfn_end)
 
 #ifdef CONFIG_IA64_PICKLE_DOMAIN
 #define page_get_owner(_p)                                              \

_______________________________________________
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] [IA64] fix compilation error caused by 19286:dd489125a2e7, Xen patchbot-unstable <=