Index: linux-2.6.13-rc6-mm2/include/linux/sched.h =================================================================== --- linux-2.6.13-rc6-mm2.orig/include/linux/sched.h 2005-08-24 16:57:43.000000000 -0700 +++ linux-2.6.13-rc6-mm2/include/linux/sched.h 2005-09-21 12:55:07.000000000 -0700 @@ -266,6 +266,15 @@ typedef unsigned long mm_counter_t; #endif struct mm_struct { + + struct rw_semaphore mmap_sem; + /* Special counters protected by the page_table_lock */ + mm_counter_t _nr_ptes; + mm_counter_t _rss; + mm_counter_t _anon_rss; + spinlock_t page_table_lock; /* Protects page tables and some counters */ + pgd_t * pgd; + struct vm_area_struct * mmap; /* list of VMAs */ struct rb_root mm_rb; struct vm_area_struct * mmap_cache; /* last find_vma result */ @@ -276,12 +285,9 @@ struct mm_struct { unsigned long mmap_base; /* base of mmap area */ unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ unsigned long free_area_cache; /* first hole of size cached_hole_size or larger */ - pgd_t * pgd; atomic_t mm_users; /* How many users with user space? */ atomic_t mm_count; /* How many references to "struct mm_struct" (users count as 1) */ int map_count; /* number of VMAs */ - struct rw_semaphore mmap_sem; - spinlock_t page_table_lock; /* Protects page tables and some counters */ struct list_head mmlist; /* List of maybe swapped mm's. These are globally strung * together off init_mm.mmlist, and are protected @@ -293,12 +299,6 @@ struct mm_struct { unsigned long arg_start, arg_end, env_start, env_end; unsigned long total_vm, locked_vm, shared_vm; unsigned long exec_vm, stack_vm, reserved_vm, def_flags; - - /* Special counters protected by the page_table_lock */ - mm_counter_t _nr_ptes; - mm_counter_t _rss; - mm_counter_t _anon_rss; - unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */ unsigned dumpable:2; Index: linux-2.6.13-rc6-mm2/Makefile =================================================================== --- linux-2.6.13-rc6-mm2.orig/Makefile 2005-08-24 16:57:36.000000000 -0700 +++ linux-2.6.13-rc6-mm2/Makefile 2005-09-21 13:01:26.000000000 -0700 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 13 -EXTRAVERSION =-rc6-mm2 +EXTRAVERSION =-rc6-mm2-single NAME=Woozy Numbat # *DOCUMENTATION*