From 3a0aa1d247a2ad724400702be4a58d4695823c06 Mon Sep 17 00:00:00 2001 From: Rik van Riel Date: Tue, 11 Dec 2012 16:01:44 -0800 Subject: [PATCH] --- yaml --- r: 338757 b: refs/heads/master c: e4c6bfd2d79d063017ab19a18915f0bc759f32d9 h: refs/heads/master i: 338755: 3c93dd5ce945f3a3aca5229b2ac03186d9c59b63 v: v3 --- [refs] | 2 +- trunk/include/linux/mm_types.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 020980cdc9ea..443865d392a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a0768f641a5bad844860e67250baf0d1aa5e03c +refs/heads/master: e4c6bfd2d79d063017ab19a18915f0bc759f32d9 diff --git a/trunk/include/linux/mm_types.h b/trunk/include/linux/mm_types.h index 94fa52b28ee8..7ade2731b5d6 100644 --- a/trunk/include/linux/mm_types.h +++ b/trunk/include/linux/mm_types.h @@ -224,7 +224,8 @@ struct vm_region { * library, the executable area etc). */ struct vm_area_struct { - struct mm_struct * vm_mm; /* The address space we belong to. */ + /* The first cache line has the info for VMA tree walking. */ + unsigned long vm_start; /* Our start address within vm_mm. */ unsigned long vm_end; /* The first byte after our end address within vm_mm. */ @@ -232,9 +233,6 @@ struct vm_area_struct { /* linked list of VM areas per task, sorted by address */ struct vm_area_struct *vm_next, *vm_prev; - pgprot_t vm_page_prot; /* Access permissions of this VMA. */ - unsigned long vm_flags; /* Flags, see mm.h. */ - struct rb_node vm_rb; /* @@ -245,6 +243,12 @@ struct vm_area_struct { */ unsigned long rb_subtree_gap; + /* Second cache line starts here. */ + + struct mm_struct *vm_mm; /* The address space we belong to. */ + pgprot_t vm_page_prot; /* Access permissions of this VMA. */ + unsigned long vm_flags; /* Flags, see mm.h. */ + /* * For areas with an address space and backing store, * linkage into the address_space->i_mmap interval tree, or