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

Browse source

Pull x86 fixes from Thomas Gleixner:
 "A few fixes for x86:

   - Don't reset the carefully adjusted build flags for the purgatory
     and remove the unwanted flags instead. The 'reset all' approach led
     to build fails under certain circumstances.

   - Unbreak CLANG build of the purgatory by avoiding the builtin
     memcpy/memset implementations.

   - Address missing prototype warnings by including the proper header

   - Fix yet more fall-through issues"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/lib/cpu: Address missing prototypes warning
  x86/purgatory: Use CFLAGS_REMOVE rather than reset KBUILD_CFLAGS
  x86/purgatory: Do not use __builtin_memcpy and __builtin_memset
  x86: mtrr: cyrix: Mark expected switch fall-through
  x86/ptrace: Mark expected switch fall-through

...

This commit is contained in:

Linus Torvalds 2019-08-10 16:24:03 -07:00

parent d2359a5153 04f5bda84b

commit 6d8f809cb5

7 changed files with 48 additions and 28 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

8

arch/x86/boot/string.c

View file

1

arch/x86/kernel/cpu/mtrr/cyrix.c

View file

1

arch/x86/kernel/ptrace.c

View file

1

arch/x86/lib/cpu.c

View file

34

arch/x86/purgatory/Makefile

View file

6

arch/x86/purgatory/purgatory.c

View file

23

arch/x86/purgatory/string.c

View file