Commit 6371e823 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Fix interleaving check
  EDAC: Correct MiB_TO_PAGES() macro
  EDAC: Fix workqueue-related crashes
parents c3606c60 e726f3c3

drivers/edac/amd64_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ static int f10_match_to_this_node(struct amd64_pvt *pvt, int dram_range, 
	debugf1("   HoleOffset=0x%x  HoleValid=0x%x IntlvSel=0x%x\n",

			hole_off, hole_valid, intlv_sel);



	if (intlv_en ||

	if (intlv_en &&

	    (intlv_sel != ((sys_addr >> 12) & intlv_en)))

		return -EINVAL;

drivers/edac/edac_core.h

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


#if PAGE_SHIFT < 20

#define PAGES_TO_MiB(pages)	((pages) >> (20 - PAGE_SHIFT))

#define MiB_TO_PAGES(mb)	((mb) >> (20 - PAGE_SHIFT))

#define MiB_TO_PAGES(mb)	((mb) << (20 - PAGE_SHIFT))

#else				/* PAGE_SHIFT > 20 */

#define PAGES_TO_MiB(pages)	((pages) << (PAGE_SHIFT - 20))

#define MiB_TO_PAGES(mb)	((mb) >> (PAGE_SHIFT - 20))

drivers/edac/edac_mc.c

+6 −4
Original line number Diff line number Diff line
@@ -586,14 +586,16 @@ struct mem_ctl_info *edac_mc_del_mc(struct device *dev) 
		return NULL;

	}



	/* marking MCI offline */

	mci->op_state = OP_OFFLINE;



	del_mc_from_global_list(mci);

	mutex_unlock(&mem_ctls_mutex);



	/* flush workq processes and remove sysfs */

	/* flush workq processes */

	edac_mc_workq_teardown(mci);



	/* marking MCI offline */

	mci->op_state = OP_OFFLINE;



	/* remove from sysfs */

	edac_remove_sysfs_mci_device(mci);



	edac_printk(KERN_INFO, EDAC_MC,