The patch titled
mm: fix __page_to_pfn() for a const struct page argument
has been removed from the -mm tree. Its filename was
mm-fix-__page_to_pfn-for-a-const-struct-page-argument.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm: fix __page_to_pfn() for a const struct page argument
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
This allows the cast in lowmem_page_address (introduced as a warning fixup
to 33dd4e0ec911 "mm: make some struct page's const") to be removed.
Propagate const'ness to page_to_section() as well since it is required by
__page_to_pfn.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Acked-by: Rik van Riel <riel@xxxxxxxxxx>
Cc: Michel Lespinasse <walken@xxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/memory_model.h | 4 ++--
include/linux/mm.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff -puN include/asm-generic/memory_model.h~mm-fix-__page_to_pfn-for-a-const-struct-page-argument include/asm-generic/memory_model.h
--- a/include/asm-generic/memory_model.h~mm-fix-__page_to_pfn-for-a-const-struct-page-argument
+++ a/include/asm-generic/memory_model.h
@@ -39,7 +39,7 @@
})
#define __page_to_pfn(pg) \
-({ struct page *__pg = (pg); \
+({ const struct page *__pg = (pg); \
struct pglist_data *__pgdat = NODE_DATA(page_to_nid(__pg)); \
(unsigned long)(__pg - __pgdat->node_mem_map) + \
__pgdat->node_start_pfn; \
@@ -57,7 +57,7 @@
* section[i].section_mem_map == mem_map's address - start_pfn;
*/
#define __page_to_pfn(pg) \
-({ struct page *__pg = (pg); \
+({ const struct page *__pg = (pg); \
int __sec = page_to_section(__pg); \
(unsigned long)(__pg - __section_mem_map_addr(__nr_to_section(__sec))); \
})
diff -puN include/linux/mm.h~mm-fix-__page_to_pfn-for-a-const-struct-page-argument include/linux/mm.h
--- a/include/linux/mm.h~mm-fix-__page_to_pfn-for-a-const-struct-page-argument
+++ a/include/linux/mm.h
@@ -685,7 +685,7 @@ static inline void set_page_section(stru
page->flags |= (section & SECTIONS_MASK) << SECTIONS_PGSHIFT;
}
-static inline unsigned long page_to_section(struct page *page)
+static inline unsigned long page_to_section(const struct page *page)
{
return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK;
}
@@ -720,7 +720,7 @@ static inline void set_page_links(struct
static __always_inline void *lowmem_page_address(const struct page *page)
{
- return __va(PFN_PHYS(page_to_pfn((struct page *)page)));
+ return __va(PFN_PHYS(page_to_pfn(page)));
}
#if defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL)
_
Patches currently in -mm which might be from ian.campbell@xxxxxxxxxx are
origin.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
