[Xen-changelog] [xen-unstable] Merge with xen-ia64-unstable.hg

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1166525597 0
# Node ID b3cd9c4ac0561a89e13c7c74a9dc990d102a6080
# Parent  6e68e8a8cc99717b372c482efa0e153e868ae6f4
# Parent  4ef0dbe95eac33033abeee36a8f13eaaeb9d5639
Merge with xen-ia64-unstable.hg
---
 xen/common/page_alloc.c   |   12 ++++++------
 xen/include/xen/elfcore.h |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff -r 6e68e8a8cc99 -r b3cd9c4ac056 xen/common/page_alloc.c
--- a/xen/common/page_alloc.c   Mon Dec 18 10:56:34 2006 -0700
+++ b/xen/common/page_alloc.c   Tue Dec 19 10:53:17 2006 +0000
@@ -490,15 +490,15 @@ void scrub_heap_pages(void)
 
     for ( mfn = first_valid_mfn; mfn < max_page; mfn++ )
     {
+        process_pending_timers();
+
+        /* Quick lock-free check. */
+        if ( allocated_in_map(mfn) )
+            continue;
+
         /* Every 100MB, print a progress dot. */
         if ( (mfn % ((100*1024*1024)/PAGE_SIZE)) == 0 )
             printk(".");
-
-        process_pending_timers();
-
-        /* Quick lock-free check. */
-        if ( allocated_in_map(mfn) )
-            continue;
 
         spin_lock_irq(&heap_lock);
 
diff -r 6e68e8a8cc99 -r b3cd9c4ac056 xen/include/xen/elfcore.h
--- a/xen/include/xen/elfcore.h Mon Dec 18 10:56:34 2006 -0700
+++ b/xen/include/xen/elfcore.h Tue Dec 19 10:53:17 2006 +0000
@@ -87,7 +87,7 @@ typedef struct
             desctype desc;                      \
             PAD32(sizeof(desctype));            \
         } desc;                                 \
-    } type
+    } __attribute__ ((packed)) type
 
 #define CORE_STR                "CORE"
 #define CORE_STR_LEN            5 /* including terminating zero */
@@ -119,7 +119,7 @@ typedef struct {
     crash_note_core_t core;
     crash_note_xen_core_t xen_regs;
     crash_note_xen_info_t xen_info;
-} crash_note_t;
+} __attribute__ ((packed)) crash_note_t;
 
 #define setup_crash_note(np, member, str, str_len, id) \
   np->member.note.note.note.namesz = str_len; \

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