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

19268ed7

Commit 19268ed7 authored 16 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'x86/pebs' into x86-v28-for-linus-phase1


Conflicts:
	include/asm-x86/ds.h

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

parents b8cd9d05 493cd912

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/Kconfig.cpu 18 additions, 0 deletions

arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c 2 additions, 1 deletion

arch/x86/kernel/cpu/intel.c
arch/x86/kernel/ds.c 677 additions, 277 deletions

arch/x86/kernel/ds.c
arch/x86/kernel/process_32.c 40 additions, 10 deletions

arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c 30 additions, 8 deletions

arch/x86/kernel/process_64.c
arch/x86/kernel/ptrace.c 269 additions, 175 deletions

arch/x86/kernel/ptrace.c
include/asm-x86/ds.h 212 additions, 46 deletions

include/asm-x86/ds.h
include/asm-x86/processor.h 9 additions, 3 deletions

include/asm-x86/processor.h
include/asm-x86/ptrace-abi.h 8 additions, 6 deletions

include/asm-x86/ptrace-abi.h
include/asm-x86/ptrace.h 36 additions, 2 deletions

include/asm-x86/ptrace.h

with 1301 additions and 528 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