The patch titled m68k-discontinuous-memory-support fix has been removed from the -mm tree. Its filename was m68k-discontinuous-memory-support-fix.patch This patch was dropped because it was folded into m68k-discontinuous-memory-support.patch ------------------------------------------------------ Subject: m68k-discontinuous-memory-support fix From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> macros which evaluate their args more than once are dangerous. Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-m68k/virtconvert.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN include/asm-m68k/virtconvert.h~m68k-discontinuous-memory-support-fix include/asm-m68k/virtconvert.h --- a/include/asm-m68k/virtconvert.h~m68k-discontinuous-memory-support-fix +++ a/include/asm-m68k/virtconvert.h @@ -30,10 +30,11 @@ static inline void *phys_to_virt(unsigne #define page_to_phys(page) \ __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT)) #else -#define page_to_phys(page) ({ \ +#define page_to_phys(_page) ({ \ + struct page *__page = _page; \ struct pglist_data *pgdat; \ - pgdat = pg_data_table[page_to_nid(page)]; \ - page_to_pfn(page) << PAGE_SHIFT; \ + pgdat = pg_data_table[page_to_nid(__page)]; \ + page_to_pfn(__page) << PAGE_SHIFT; \ }) #endif _ Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are m68k-runtime-patching-infrastructure.patch m68k-discontinuous-memory-support.patch m68k-discontinuous-memory-support-fix.patch lots-of-architectures-enable-arbitary-speed-tty-support.patch git-scsi-misc.patch m68k-parenthesis-balance.patch dma-mapping-prevent-dma-dependent-code-from-linking-on.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