Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source

Pull x86 timer updates from Ingo Molnar:
 "Two changes: add the new convert_art_ns_to_tsc() API for upcoming
  Intel Goldmont+ drivers, and remove the obsolete rdtscll() API"

* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tsc: Get rid of rdtscll()
  x86/tsc: Convert ART in nanoseconds to TSC

...

This commit is contained in:

Linus Torvalds 2018-04-02 16:18:31 -07:00

parent cea061e455 ea89c06548

commit a5532439eb

5 changed files with 43 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/x86/events/msr.c

View file

3

arch/x86/include/asm/msr.h

View file

1

arch/x86/include/asm/tsc.h

View file

2

arch/x86/kernel/cpu/mcheck/mce-inject.c

View file

39

arch/x86/kernel/tsc.c

View file