From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 19 Feb 2015 12:18:02 +0000 (+0100)
Subject: Merge tag 'ras_for_3.21' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras... 
X-Git-Tag: v4.14-rc1~5636^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa45a45ca34891614789e68dfbf7ce344c9013ac;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'ras_for_3.21' of git://git./linux/kernel/git/ras/ras into x86/ras

Pull RAS updates from Borislav Petkov:

 "- Enable AMD thresholding IRQ by default if supported. (Aravind Gopalakrishnan)

  - Unify mce_panic() message pattern. (Derek Che)

  - A bit more involved simplification of the CMCI logic after yet another
    report about race condition with the adaptive logic. (Borislav Petkov)

  - ACPI APEI EINJ fleshing out of the user documentation. (Borislav Petkov)

  - Minor cleanup. (Jan Beulich.)"

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

fa45a45ca34891614789e68dfbf7ce344c9013ac
diff --cc arch/x86/include/asm/mce.h
index 9b3de99,13eeea5..fd38a23
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@@ -183,13 -183,14 +183,13 @@@ typedef DECLARE_BITMAP(mce_banks_t, MAX
  DECLARE_PER_CPU(mce_banks_t, mce_poll_banks);
  
  enum mcp_flags {
- 	MCP_TIMESTAMP = (1 << 0),	/* log time stamp */
- 	MCP_UC = (1 << 1),		/* log uncorrected errors */
- 	MCP_DONTLOG = (1 << 2),		/* only clear, don't log */
+ 	MCP_TIMESTAMP	= BIT(0),	/* log time stamp */
+ 	MCP_UC		= BIT(1),	/* log uncorrected errors */
+ 	MCP_DONTLOG	= BIT(2),	/* only clear, don't log */
  };
- void machine_check_poll(enum mcp_flags flags, mce_banks_t *b);
+ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b);
  
  int mce_notify_irq(void);
 -void mce_notify_process(void);
  
  DECLARE_PER_CPU(struct mce, injectm);