direct-io.hg

changeset 13086:b3cd9c4ac056

Merge with xen-ia64-unstable.hg
author kfraser@localhost.localdomain
date Tue Dec 19 10:53:17 2006 +0000 (2006-12-19)
parents 6e68e8a8cc99 4ef0dbe95eac
children 8348e3a1a31e
files
line diff
     1.1 --- a/xen/common/page_alloc.c	Mon Dec 18 10:56:34 2006 -0700
     1.2 +++ b/xen/common/page_alloc.c	Tue Dec 19 10:53:17 2006 +0000
     1.3 @@ -490,16 +490,16 @@ void scrub_heap_pages(void)
     1.4  
     1.5      for ( mfn = first_valid_mfn; mfn < max_page; mfn++ )
     1.6      {
     1.7 -        /* Every 100MB, print a progress dot. */
     1.8 -        if ( (mfn % ((100*1024*1024)/PAGE_SIZE)) == 0 )
     1.9 -            printk(".");
    1.10 -
    1.11          process_pending_timers();
    1.12  
    1.13          /* Quick lock-free check. */
    1.14          if ( allocated_in_map(mfn) )
    1.15              continue;
    1.16  
    1.17 +        /* Every 100MB, print a progress dot. */
    1.18 +        if ( (mfn % ((100*1024*1024)/PAGE_SIZE)) == 0 )
    1.19 +            printk(".");
    1.20 +
    1.21          spin_lock_irq(&heap_lock);
    1.22  
    1.23          /* Re-check page status with lock held. */
     2.1 --- a/xen/include/xen/elfcore.h	Mon Dec 18 10:56:34 2006 -0700
     2.2 +++ b/xen/include/xen/elfcore.h	Tue Dec 19 10:53:17 2006 +0000
     2.3 @@ -87,7 +87,7 @@ typedef struct
     2.4              desctype desc;                      \
     2.5              PAD32(sizeof(desctype));            \
     2.6          } desc;                                 \
     2.7 -    } type
     2.8 +    } __attribute__ ((packed)) type
     2.9  
    2.10  #define CORE_STR                "CORE"
    2.11  #define CORE_STR_LEN            5 /* including terminating zero */
    2.12 @@ -119,7 +119,7 @@ typedef struct {
    2.13      crash_note_core_t core;
    2.14      crash_note_xen_core_t xen_regs;
    2.15      crash_note_xen_info_t xen_info;
    2.16 -} crash_note_t;
    2.17 +} __attribute__ ((packed)) crash_note_t;
    2.18  
    2.19  #define setup_crash_note(np, member, str, str_len, id) \
    2.20    np->member.note.note.note.namesz = str_len; \