On 3/24/2015 3:30 AM, Borislav Petkov wrote:
On Mon, Mar 23, 2015 at 10:42:52AM -0500, Aravind Gopalakrishnan wrote:
+/* keeping mce_severity_amd in sync with AMD error scope heirarchy table */
Which table do you mean?
I changed it to:
/*
* See AMD Error Scope Hierarchy table in a newer BKDG. For example
* 49125_15h_Models_30h-3Fh_BKDG.pdf, section "RAS Features"
*/
Yes, this is the one I meant.
Thanks.
to explicitly name it.
+static int mce_severity_amd(struct mce *m, enum context ctx)
+{
+ enum context ctx = error_context(m);
arch/x86/kernel/cpu/mcheck/mce-severity.c: In function ‘mce_severity_amd’:
arch/x86/kernel/cpu/mcheck/mce-severity.c:192:15: error: ‘ctx’ redeclared as
different kind of symbol
enum context ctx = error_context(m);
^
arch/x86/kernel/cpu/mcheck/mce-severity.c:190:57: note: previous definition of
‘ctx’ was here
static int mce_severity_amd(struct mce *m, enum context ctx)
^
make[4]: *** [arch/x86/kernel/cpu/mcheck/mce-severity.o] Error 1
make[3]: *** [arch/x86/kernel/cpu/mcheck] Error 2
make[2]: *** [arch/x86/kernel/cpu] Error 2
make[1]: *** [arch/x86/kernel] Error 2
make: *** [arch/x86] Error 2
make: *** Waiting for unfinished jobs....
I fixed it up.
Sorry about that.
That line should be in [patch 2/2] and I mistakenly committed it as part
of this patch.
It didn't show up on my builds as I had build tested after applying both
patches.
But there is a different problem now.
The second patch won't apply cleanly on top of your fix-
error: while searching for:
}
/* keeping mce_severity_amd in sync with AMD error scope heirarchy table */
static int mce_severity_amd(struct mce *m, enum context ctx)
{
enum context ctx = error_context(m);
/* Processor Context Corrupt, no need to fumble too much, die! */
error: patch failed: arch/x86/kernel/cpu/mcheck/mce-severity.c:187
I think the clean way to fix this would be to move the line to [patch 2/2].
Besides, we would need a new patch 2 anyway as the patch application
would fail due to changes to the comment line.
Shall I do that and resend?
Thanks,
-Aravind.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
