Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

40b46a7d

Commit 40b46a7d authored 12 years ago by H. Peter Anvin

Downloads
- Plain Diff

Merge remote-tracking branch 'rostedt/tip/perf/urgent-2' into x86-urgent-for-linus

parents bad1a753 5963e317

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/include/asm/ftrace.h 1 addition, 1 deletion

arch/x86/include/asm/ftrace.h
arch/x86/kernel/cpu/common.c 7 additions, 1 deletion

arch/x86/kernel/cpu/common.c
arch/x86/kernel/entry_64.S 41 additions, 3 deletions

arch/x86/kernel/entry_64.S
arch/x86/kernel/ftrace.c 95 additions, 7 deletions

arch/x86/kernel/ftrace.c
arch/x86/kernel/nmi.c 4 additions, 2 deletions

arch/x86/kernel/nmi.c
arch/x86/kernel/traps.c 6 additions, 2 deletions

arch/x86/kernel/traps.c

with 154 additions and 16 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