diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-12-19 10:53:17 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-12-19 10:53:17 +0000 |
| commit | 32618ccbf5950b8149744549cfc4dfb3fee315b0 (patch) | |
| tree | 1acc8c9e9793c88d556d810063bd27040425028d | |
| parent | f4556d236293d4b8965d47f2c9651d6f0f68e8a7 (diff) | |
| parent | bab7d4e41bcef7b1fb80cc51c9d6756b06041575 (diff) | |
| download | xen-32618ccbf5950b8149744549cfc4dfb3fee315b0.tar.gz xen-32618ccbf5950b8149744549cfc4dfb3fee315b0.tar.bz2 xen-32618ccbf5950b8149744549cfc4dfb3fee315b0.zip | |
Merge with xen-ia64-unstable.hg
| -rw-r--r-- | xen/common/page_alloc.c | 8 | ||||
| -rw-r--r-- | xen/include/xen/elfcore.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 89cc140cf1..4a7527859b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -490,16 +490,16 @@ void scrub_heap_pages(void) for ( mfn = first_valid_mfn; mfn < max_page; mfn++ ) { - /* 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; + /* Every 100MB, print a progress dot. */ + if ( (mfn % ((100*1024*1024)/PAGE_SIZE)) == 0 ) + printk("."); + spin_lock_irq(&heap_lock); /* Re-check page status with lock held. */ diff --git a/xen/include/xen/elfcore.h b/xen/include/xen/elfcore.h index 356fc1744d..75ce7c49ef 100644 --- a/xen/include/xen/elfcore.h +++ b/xen/include/xen/elfcore.h @@ -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; \ |