Skip to contentSkip to conversation

Please pull from mce3 tree

DISCUSSION Andi Kleen 1 participant 1 message May 27, 2009

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

This is the updated mce3 tree. That's basically Ingo's tip x86/mce2 tree, only rebased to 2.6.30-rc7 and with some compilation bugs fixed and one patch reverted (with the agreement of the patch author)

I folded the fixes into the original patches with comments.

Please add to tip.

-Andi

The following changes since commit 59a3759d0fe8d969888c741bb33f4946e4d3750d:
Linus Torvalds (1):

        Linux 2.6.30-rc7

are available in the git repository at:

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

Hidetoshi Seto (2):
x86, mce: Add mce_threshold option for intel cmci x86, mce: Cleanup param parser

Ingo Molnar (17):
x86, mce: clean up the mce_64.c code
x86, mce: clean up the sysfs variables namespace x86, mce: clean up mce_amd_64.c
x86, mce: clean up p4.c
x86, mce: clean up therm_throt.c
x86, mce: clean up p6.c
x86, mce: clean up k7.c
x86, mce: clean up non-fatal.c
x86, mce: clean up mce_32.c
x86, mce: clean up p5.c
x86, mce: clean up winchip.c
x86, mce: clean up mce.h
x86, mce: prepare mce.h and mce_64.c for unification x86, mce: prepare unification
x86, mce: unify, prepare for 32-bit
x86, mce: unify
x86, mce: print number of MCE banks

Thomas Gleixner (4):
mce: unify Intel thermal init, prepare x86, mce: unify the Intel thermal interrupt code x86, mce: clean up mce_intel.c
x86, mce: clean up mce_64.c

 Documentation/kernel-parameters.txt            |    5 +
 arch/x86/include/asm/mce.h                     |   38 ++--
 arch/x86/include/asm/msr-index.h               |   11 +
 arch/x86/kernel/cpu/mcheck/Makefile            |    5 +-
 arch/x86/kernel/cpu/mcheck/k7.c                |   36 ++-
 arch/x86/kernel/cpu/mcheck/{mce_64.c => mce.c} |  391 ++++++++++++++++--------
 arch/x86/kernel/cpu/mcheck/mce.h               |   21 +-
 arch/x86/kernel/cpu/mcheck/mce_32.c            |   76 -----
 arch/x86/kernel/cpu/mcheck/mce_amd_64.c        |  187 +++++++-----
 arch/x86/kernel/cpu/mcheck/mce_intel.c         |   76 +++++
 arch/x86/kernel/cpu/mcheck/mce_intel_64.c      |  112 ++++----
 arch/x86/kernel/cpu/mcheck/non-fatal.c         |   57 ++--
 arch/x86/kernel/cpu/mcheck/p4.c                |   84 ++----
 arch/x86/kernel/cpu/mcheck/p5.c                |   43 ++-
 arch/x86/kernel/cpu/mcheck/p6.c                |   26 +-
 arch/x86/kernel/cpu/mcheck/therm_throt.c       |   74 +++---
 arch/x86/kernel/cpu/mcheck/winchip.c           |   17 +-
 17 files changed, 720 insertions(+), 539 deletions(-)
 rename arch/x86/kernel/cpu/mcheck/{mce_64.c => mce.c} (80%)
 delete mode 100644 arch/x86/kernel/cpu/mcheck/mce_32.c
 create mode 100644 arch/x86/kernel/cpu/mcheck/mce_intel.c
Signature · 1 line
[email protected] -- Speaking for myself only.