Justus Winter, le Thu 02 Jan 2014 20:02:43 +0100, a écrit : > * vm/vm_page.h (struct vm_page): Merge the two bit fields.
Ack. > --- > vm/vm_page.h | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/vm/vm_page.h b/vm/vm_page.h > index 7392044..339d355 100644 > --- a/vm/vm_page.h > +++ b/vm/vm_page.h > @@ -92,11 +92,8 @@ struct vm_page { > free:1, /* page is on free list (P) */ > reference:1, /* page has been used (P) */ > external:1, /* page considered external (P) */ > - extcounted:1, /* page counted in ext counts (P) */ > - :0; /* (force to 'long' boundary) */ > - > - unsigned int > - /* boolean_t */ busy:1, /* page is in transit (O) */ > + extcounted:1, /* page counted in ext counts (P) */ > + busy:1, /* page is in transit (O) */ > wanted:1, /* someone is waiting for page (O) */ > tabled:1, /* page is in VP table (O) */ > fictitious:1, /* Physical page doesn't exist (O) */ > @@ -109,10 +106,9 @@ struct vm_page { > dirty:1, /* Page must be cleaned (O) */ > precious:1, /* Page is precious; data must be > * returned even if clean (O) */ > - overwriting:1, /* Request to unlock has been made > + overwriting:1; /* Request to unlock has been made > * without having data. (O) > * [See vm_object_overwrite] */ > - :0; > > vm_offset_t phys_addr; /* Physical address of page, passed > * to pmap_enter (read-only) */ > -- > 1.8.5.2 > -- Samuel +#if defined(__alpha__) && defined(CONFIG_PCI) + /* + * The meaning of life, the universe, and everything. Plus + * this makes the year come out right. + */ + year -= 42; +#endif (From the patch for 1.3.2: (kernel/time.c), submitted by Marcus Meissner)