Subject: + hexagon-use-generic-fixmaph.patch added to -mm tree To: msalter@xxxxxxxxxx,rkuo@xxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 16 Dec 2013 11:55:55 -0800 The patch titled Subject: hexagon: use generic fixmap.h has been added to the -mm tree. Its filename is hexagon-use-generic-fixmaph.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/hexagon-use-generic-fixmaph.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/hexagon-use-generic-fixmaph.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mark Salter <msalter@xxxxxxxxxx> Subject: hexagon: use generic fixmap.h Signed-off-by: Mark Salter <msalter@xxxxxxxxxx> Acked-by: Richard Kuo <rkuo@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/hexagon/include/asm/fixmap.h | 40 ---------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff -puN arch/hexagon/include/asm/fixmap.h~hexagon-use-generic-fixmaph arch/hexagon/include/asm/fixmap.h --- a/arch/hexagon/include/asm/fixmap.h~hexagon-use-generic-fixmaph +++ a/arch/hexagon/include/asm/fixmap.h @@ -26,45 +26,7 @@ */ #include <asm/mem-layout.h> -/* - * Full fixmap support involves set_fixmap() functions, but - * these may not be needed if all we're after is an area for - * highmem kernel mappings. - */ -#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) -#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) - -extern void __this_fixmap_does_not_exist(void); - -/** - * fix_to_virt -- "index to address" translation. - * - * If anyone tries to use the idx directly without translation, - * we catch the bug with a NULL-deference kernel oops. Illegal - * ranges of incoming indices are caught too. - */ -static inline unsigned long fix_to_virt(const unsigned int idx) -{ - /* - * This branch gets completely eliminated after inlining, - * except when someone tries to use fixaddr indices in an - * illegal way. (such as mixing up address types or using - * out-of-range indices). - * - * If it doesn't get removed, the linker will complain - * loudly with a reasonably clear error message.. - */ - if (idx >= __end_of_fixed_addresses) - __this_fixmap_does_not_exist(); - - return __fix_to_virt(idx); -} - -static inline unsigned long virt_to_fix(const unsigned long vaddr) -{ - BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); - return __virt_to_fix(vaddr); -} +#include <asm-generic/fixmap.h> #define kmap_get_fixmap_pte(vaddr) \ pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), \ _ Patches currently in -mm which might be from msalter@xxxxxxxxxx are add-generic-fixmaph.patch x86-use-generic-fixmaph.patch arm-use-generic-fixmaph.patch hexagon-use-generic-fixmaph.patch metag-use-generic-fixmaph.patch microblaze-use-generic-fixmaph.patch mips-use-generic-fixmaph.patch powerpc-use-generic-fixmaph.patch sh-use-generic-fixmaph.patch tile-use-generic-fixmaph.patch um-use-generic-fixmaph.patch linux-next.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