The patch titled
Subject: mm/highmem.c: remove useless page_address_map.virtual
has been removed from the -mm tree. Its filename was
mm-highmem-remove-useless-virtual-variable-in-page_address_map.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Subject: mm/highmem.c: remove useless page_address_map.virtual
We can get the virtual address without page_address_map.virtual, so remove
it.
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Jiang Liu <liuj97@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/highmem.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -puN mm/highmem.c~mm-highmem-remove-useless-virtual-variable-in-page_address_map mm/highmem.c
--- a/mm/highmem.c~mm-highmem-remove-useless-virtual-variable-in-page_address_map
+++ a/mm/highmem.c
@@ -320,7 +320,6 @@ EXPORT_SYMBOL(kunmap_high);
*/
struct page_address_map {
struct page *page;
- void *virtual;
struct list_head list;
};
@@ -362,7 +361,10 @@ void *page_address(const struct page *pa
list_for_each_entry(pam, &pas->lh, list) {
if (pam->page == page) {
- ret = pam->virtual;
+ int nr;
+
+ nr = pam - page_address_map;
+ ret = PKMAP_ADDR(nr);
goto done;
}
}
@@ -391,7 +393,6 @@ void set_page_address(struct page *page,
if (virtual) { /* Add */
pam = &page_address_maps[PKMAP_NR((unsigned long)virtual)];
pam->page = page;
- pam->virtual = virtual;
spin_lock_irqsave(&pas->lock, flags);
list_add_tail(&pam->list, &pas->lh);
_
Patches currently in -mm which might be from iamjoonsoo.kim@xxxxxxx are
linux-next.patch
mm-vmalloc-change-iterating-a-vmlist-to-find_vm_area.patch
mm-vmalloc-move-get_vmalloc_info-to-vmallocc.patch
mm-vmalloc-protect-va-vm-by-vmap_area_lock.patch
mm-vmalloc-iterate-vmap_area_list-instead-of-vmlist-in-vread-vwrite.patch
mm-vmalloc-iterate-vmap_area_list-in-get_vmalloc_info.patch
mm-vmalloc-iterate-vmap_area_list-instead-of-vmlist-in-vmallocinfo.patch
mm-vmalloc-export-vmap_area_list-instead-of-vmlist.patch
mm-vmalloc-remove-list-management-of-vmlist-after-initializing-vmalloc.patch
kexec-vmalloc-export-additional-vmalloc-layer-information.patch
mm-nobootmem-clean-up-of-free_low_memory_core_early.patch
mm-nobootmem-do-memset-after-memblock_reserve.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
