Skip to contentSkip to conversation

Please pull MCE 32bit merge tree

DISCUSSION Andi Kleen 1 participant 1 message May 27, 2009

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

Please pull the mce3-32bitmerge tree that enables the 64bit machine check code on 32bit x86 too, as earlier discussed.
It also includes the machine check injector because I needed that for testing.

It is based on the mce3 tree I offered earlier.

This is the patch kit I posted yesterday. There were some reviews, but no negative comments.

This should be merged for 2.6.31

Thanks,
-Andi

The following changes since commit 509116152e7c09ed2e0e8b2dae241b89d9d0e699:
Ingo Molnar (1):
x86, mce: print number of MCE banks

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git mce3-32bitmerge

Andi Kleen (17):
x86: MCE: Initial steps to make 64bit mce code 32bit clean
x86: MCE: Implement the PPro bank 0 quirk in the 64bit machine check code
x86: MCE: Port K7 bank 0 quirk to 64bit mce code
x86: MCE: Use a call vector to call the 64bit mce handler
x86: MCE: Rename 64bit mce_dont_init to mce_disabled
x86: MCE: Move mce_disabled option into common 64bit/64bit code
x86: MCE: Remove machine check handler idle notify on 64bit
x86: MCE: Remove oops_begin() use in 64bit machine check
x86: MCE: Remove unused stop/restart_mce on 32bit
x86: MCE: Use 64bit machine check code on 32bit
x86: MCE: Deprecate old 32bit machine check code
x86: MCE: Enable MCE_INTEL for 32bit new MCE
x86: MCE: Enable MCE_AMD for 32bit NEW_MCE
x86: MCE: Document new 32bit mcelog requirement in Documentation/Changes Export add_timer_on for modules
x86: MCE: Add MSR read wrappers for easier error injection
x86: MCE: Add basic error injection infrastructure

 Documentation/Changes                      |   15 ++
 Documentation/feature-removal-schedule.txt |   10 +
 arch/x86/Kconfig                           |   45 +++++-
 arch/x86/include/asm/entry_arch.h          |    6 +-
 arch/x86/include/asm/hardirq.h             |    2 +-
 arch/x86/include/asm/irq_vectors.h         |    5 +-
 arch/x86/include/asm/mce.h                 |    7 +-
 arch/x86/kernel/apic/apic.c                |    4 +-
 arch/x86/kernel/apic/nmi.c                 |    2 +-
 arch/x86/kernel/cpu/mcheck/Makefile        |    4 +-
 arch/x86/kernel/cpu/mcheck/mce-inject.c    |  126 +++++++++++++
 arch/x86/kernel/cpu/mcheck/mce.c           |  265 +++++++++++++++++-----------
 arch/x86/kernel/cpu/mcheck/mce.h           |   19 ++-
 arch/x86/kernel/cpu/mcheck/p5.c            |    5 +
 arch/x86/kernel/cpu/mcheck/threshold.c     |    2 +-
 arch/x86/kernel/entry_64.S                 |    4 +-
 arch/x86/kernel/irq.c                      |    4 +-
 arch/x86/kernel/irqinit_32.c               |    6 +-
 arch/x86/kernel/signal.c                   |    4 +-
 arch/x86/kernel/traps.c                    |    6 +-
 kernel/timer.c                             |    1 +
 21 files changed, 412 insertions(+), 130 deletions(-)
 create mode 100644 arch/x86/kernel/cpu/mcheck/mce-inject.c
Signature · 1 line
[email protected] -- Speaking for myself only.