From 87d7776a8dbbe09b16ac754cad7e0af4236d5ac6 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Thu, 31 May 2012 16:26:19 -0700 Subject: [PATCH] --- yaml --- r: 309741 b: refs/heads/master c: 052fb0d635df5d49dfc85687d94e1a87bf09378d h: refs/heads/master i: 309739: b7b19227d495224444e721f80a1fbf1653fa83f8 v: v3 --- [refs] | 2 +- trunk/Documentation/vm/pagemap.txt | 2 +- trunk/fs/proc/task_mmu.c | 48 +++++++++++++++++++----------- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 5c61360568cb..c2393f777ad0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 715be1fce0d964aca15618b24f6f415f3cbd03c8 +refs/heads/master: 052fb0d635df5d49dfc85687d94e1a87bf09378d diff --git a/trunk/Documentation/vm/pagemap.txt b/trunk/Documentation/vm/pagemap.txt index 4600cbe3d6be..7587493c67f1 100644 --- a/trunk/Documentation/vm/pagemap.txt +++ b/trunk/Documentation/vm/pagemap.txt @@ -16,7 +16,7 @@ There are three components to pagemap: * Bits 0-4 swap type if swapped * Bits 5-54 swap offset if swapped * Bits 55-60 page shift (page size = 1<vm_start <= addr) && !is_vm_hugetlb_page(vma)) { pte = pte_offset_map(pmd, addr); - pte_to_pagemap_entry(&pme, *pte); + pte_to_pagemap_entry(&pme, vma, addr, *pte); /* unmap before userspace copy */ pte_unmap(pte); } @@ -869,11 +881,11 @@ static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask, * For each page in the address space, this file contains one 64-bit entry * consisting of the following: * - * Bits 0-55 page frame number (PFN) if present + * Bits 0-54 page frame number (PFN) if present * Bits 0-4 swap type if swapped - * Bits 5-55 swap offset if swapped + * Bits 5-54 swap offset if swapped * Bits 55-60 page shift (page size = 1<