The patch titled nommu: provide is_vmalloc_addr() stub has been added to the -mm tree. Its filename is nommu-provide-is_vmalloc_addr-stub.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: nommu: provide is_vmalloc_addr() stub From: Paul Mundt <lethal@xxxxxxxxxxxx> Introduced in commit-id 9e2779fa281cfda13ac060753d674bbcaa23367e and ifdef'ed out for nommu in 8ca3ed87db062201e1fa15b64a9214e193fc3a8a, both approaches end up breaking the nommu build in different ways. An impressive feat for a 2-liner. Current is_vmalloc_addr() users fall in to two camps: - Determining whether to use vfree()/kfree() - Whether to do vmlist traversal (only /proc/kcore). Since we don't support /proc/kcore on nommu, that leaves the vfree()/kfree() determination use cases. nommu vfree() happens to be a wrapper to kfree() anyways, so is_vmalloc_addr() can always return 0 and end up with the right behaviour. Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Greg Ungerer <gerg@xxxxxxxxxxxx> Cc: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mm.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff -puN include/linux/mm.h~nommu-provide-is_vmalloc_addr-stub include/linux/mm.h --- a/include/linux/mm.h~nommu-provide-is_vmalloc_addr-stub +++ a/include/linux/mm.h @@ -235,15 +235,22 @@ static inline int get_page_unless_zero(s struct page *vmalloc_to_page(const void *addr); unsigned long vmalloc_to_pfn(const void *addr); -#ifdef CONFIG_MMU -/* Determine if an address is within the vmalloc range */ +/* + * Determine if an address is within the vmalloc range + * + * On nommu, vmalloc/vfree wrap through kmalloc/kfree directly, so there + * is no special casing required. + */ static inline int is_vmalloc_addr(const void *x) { +#ifdef CONFIG_MMU unsigned long addr = (unsigned long)x; return addr >= VMALLOC_START && addr < VMALLOC_END; -} +#else + return 0; #endif +} static inline struct page *compound_head(struct page *page) { _ Patches currently in -mm which might be from lethal@xxxxxxxxxxxx are nommu-provide-is_vmalloc_addr-stub.patch maple-allow-removal-and-reinsertion-of-keyboard-driver-module.patch maple-add-driver-for-sega-dreamcast-controller.patch smc91x-pass-along-private-data-v2.patch smc91x-introduce-platform-data-flags-v2.patch smc91x-add-insw-outsw-to-default-config-v2.patch smc91x-make-superh-use-default-config-v2.patch git-sh.patch smc91x-fix-build-breakage-from-the-smc_get_mac_addr-api-upgrade.patch taint-kernel-after-warn_oncondition.patch sm501-add-uart-support.patch asm-futexh-should-include-linux-uaccessh.patch remove-duplicated-unlikely-in-is_err.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