ia64/xen-unstable

changeset 19094:728d1892f0e2

x86: Clean up shadow_page_info after page_info changes.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Jan 26 16:52:38 2009 +0000 (2009-01-26)
parents 90909b81b3b9
children 6b10d97d6fd4
files xen/arch/x86/mm/shadow/private.h
line diff
     1.1 --- a/xen/arch/x86/mm/shadow/private.h	Mon Jan 26 16:34:51 2009 +0000
     1.2 +++ b/xen/arch/x86/mm/shadow/private.h	Mon Jan 26 16:52:38 2009 +0000
     1.3 @@ -244,16 +244,10 @@ struct shadow_page_info
     1.4                  u32 tlbflush_timestamp;
     1.5              };
     1.6              struct {
     1.7 -                unsigned int type:5;   /* What kind of shadow is this? */
     1.8 -                unsigned int pinned:1; /* Is the shadow pinned? */
     1.9 -                unsigned int count:26; /* Reference count */
    1.10 -#ifdef __x86_64__
    1.11 -                u32 pad;
    1.12 -                u64 mbz;               /* Must be zero: this is where the
    1.13 -                                        * owner field lives in page_info */
    1.14 -#else
    1.15 -                u32 mbz;
    1.16 -#endif
    1.17 +                unsigned long mbz;     /* Must be zero: count_info is here. */
    1.18 +                unsigned long type:5;   /* What kind of shadow is this? */
    1.19 +                unsigned long pinned:1; /* Is the shadow pinned? */
    1.20 +                unsigned long count:26; /* Reference count */
    1.21              } __attribute__((packed));
    1.22              union {
    1.23                  /* For unused shadow pages, a list of pages of this order; for 
    1.24 @@ -277,7 +271,7 @@ static inline void shadow_check_page_str
    1.25      BUILD_BUG_ON(sizeof (struct shadow_page_info) !=
    1.26                   sizeof (struct page_info));
    1.27      BUILD_BUG_ON(offsetof(struct shadow_page_info, mbz) !=
    1.28 -                 offsetof(struct page_info, u.inuse._domain));
    1.29 +                 offsetof(struct page_info, count_info));
    1.30  };
    1.31  
    1.32  /* Shadow type codes */