The patch titled Delete unused definitions of kvaddr_to_nid has been removed from the -mm tree. Its filename is delete-unused-definitions-of-kvaddr_to_nid.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Delete unused definitions of kvaddr_to_nid From: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/asm-mips/mmzone.h | 1 - include/asm-parisc/mmzone.h | 5 ----- include/asm-x86_64/mmzone.h | 1 - 3 files changed, 7 deletions(-) diff -puN include/asm-mips/mmzone.h~delete-unused-definitions-of-kvaddr_to_nid include/asm-mips/mmzone.h --- a/include/asm-mips/mmzone.h~delete-unused-definitions-of-kvaddr_to_nid +++ a/include/asm-mips/mmzone.h @@ -10,7 +10,6 @@ #ifdef CONFIG_DISCONTIGMEM -#define kvaddr_to_nid(kvaddr) pa_to_nid(__pa(kvaddr)) #define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) #endif /* CONFIG_DISCONTIGMEM */ diff -puN include/asm-parisc/mmzone.h~delete-unused-definitions-of-kvaddr_to_nid include/asm-parisc/mmzone.h --- a/include/asm-parisc/mmzone.h~delete-unused-definitions-of-kvaddr_to_nid +++ a/include/asm-parisc/mmzone.h @@ -14,11 +14,6 @@ extern struct node_map_data node_data[]; #define NODE_DATA(nid) (&node_data[nid].pg_data) -/* - * Given a kernel address, find the home node of the underlying memory. - */ -#define kvaddr_to_nid(kaddr) pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT) - #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) #define node_end_pfn(nid) \ ({ \ diff -puN include/asm-x86_64/mmzone.h~delete-unused-definitions-of-kvaddr_to_nid include/asm-x86_64/mmzone.h --- a/include/asm-x86_64/mmzone.h~delete-unused-definitions-of-kvaddr_to_nid +++ a/include/asm-x86_64/mmzone.h @@ -42,7 +42,6 @@ static inline __attribute__((pure)) int #ifdef CONFIG_DISCONTIGMEM #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) -#define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr)) extern int pfn_valid(unsigned long pfn); #endif _ Patches currently in -mm which might be from ralf@xxxxxxxxxxxxxx are origin.patch n32-sigset-and-__compat_endian_swap__.patch au1550_ac97-spin_unlock-in-error-path.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