diff --git a/[refs] b/[refs] index 8b8d89349d2f..6d1f6afff1d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27100db0e0d381d24b6f3cb1a4f439996e7c00c8 +refs/heads/master: 5034086b72e4e2d42f0db4b4ebb0fe0129ebdeae diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c index aeb01f42ffef..764207ed6d44 100644 --- a/trunk/drivers/edac/i7core_edac.c +++ b/trunk/drivers/edac/i7core_edac.c @@ -1917,7 +1917,7 @@ static int i7core_mce_check_error(void *priv, struct mce *mce) #ifdef CONFIG_SMP /* Only handle if it is the right mc controller */ - if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket) + if (mce->socketid != pvt->i7core_dev->socket) return 0; #endif