Merge branch 'x86/urgent' into perf/urgent, to pick up new CPU model definitions (7a275fd7) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

7a275fd7

Commit 7a275fd7 authored 5 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'x86/urgent' into perf/urgent, to pick up new CPU model definitions


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents df4d2973 8d7c6ac3

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/intel-family.h 3 additions, 0 deletions

arch/x86/include/asm/intel-family.h
arch/x86/include/asm/mwait.h 1 addition, 1 deletion

arch/x86/include/asm/mwait.h
arch/x86/kernel/cpu/vmware.c 1 addition, 1 deletion

arch/x86/kernel/cpu/vmware.c
arch/x86/lib/delay.c 2 additions, 2 deletions

arch/x86/lib/delay.c
include/linux/string.h 20 additions, 1 deletion

include/linux/string.h
lib/string.c 0 additions, 21 deletions

lib/string.c

with 27 additions and 26 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