Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

26fb20d0

Commit 26fb20d0 authored 15 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'perf/mce' into perf/core


Merge reason: It's ready for v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parents 23ba90e3 767df1bd

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/include/asm/hardirq.h 3 additions, 3 deletions

arch/x86/include/asm/hardirq.h
arch/x86/include/asm/mce.h 12 additions, 2 deletions

arch/x86/include/asm/mce.h
arch/x86/kernel/cpu/common.c 1 addition, 3 deletions

arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/mcheck/mce.c 64 additions, 39 deletions

arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/therm_throt.c 28 additions, 1 deletion

arch/x86/kernel/cpu/mcheck/therm_throt.c
arch/x86/kernel/irq.c 6 additions, 6 deletions

arch/x86/kernel/irq.c
arch/x86/kernel/setup.c 3 additions, 0 deletions

arch/x86/kernel/setup.c
drivers/edac/edac_mce_amd.c 12 additions, 9 deletions

drivers/edac/edac_mce_amd.c
include/trace/events/mce.h 69 additions, 0 deletions

include/trace/events/mce.h

with 198 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment