The patch titled edac: build fix has been added to the -mm tree. Its filename is edac-build-fix.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://userweb.kernel.org/~akpm/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: edac: build fix From: Borislav Petkov <borislav.petkov@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/edac/amd64_edac.c | 2 +- drivers/edac/amd64_edac.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff -puN drivers/edac/amd64_edac.c~edac-build-fix drivers/edac/amd64_edac.c --- a/drivers/edac/amd64_edac.c~edac-build-fix +++ a/drivers/edac/amd64_edac.c @@ -1419,7 +1419,7 @@ static u32 f10_determine_channel(struct if (dct_sel_interleave_addr(pvt) == 0) cs = sys_addr >> 6 & 1; else if ((dct_sel_interleave_addr(pvt) >> 1) & 1) { - temp = popcnt((u32) ((sys_addr >> 16) & 0x1F)) % 2; + temp = hweight_long((u32) ((sys_addr >> 16) & 0x1F)) % 2; if (dct_sel_interleave_addr(pvt) & 1) cs = (sys_addr >> 9 & 1) ^ temp; diff -puN drivers/edac/amd64_edac.h~edac-build-fix drivers/edac/amd64_edac.h --- a/drivers/edac/amd64_edac.h~edac-build-fix +++ a/drivers/edac/amd64_edac.h @@ -443,19 +443,6 @@ enum { #define K8_MSR_MC4STAT 0x0411 #define K8_MSR_MC4ADDR 0x0412 -/* - * popcnt - count the set bits in a bit vector. - * @vec - bit vector - * - * This instruction is supported only on F10h and later CPUs. - */ -#define popcnt(x) \ -({ \ - typeof(x) __ret; \ - __asm__("popcnt %1, %0" : "=r" (__ret) : "r" (x)); \ - __ret; \ -}) - /* AMD sets the first MC device at device ID 0x18. */ static inline int get_mc_node_id_from_pdev(struct pci_dev *pdev) { _ Patches currently in -mm which might be from borislav.petkov@xxxxxxx are linux-next.patch edac-build-fix.patch edac-compile-workaround.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