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

Browse source

Pull x86 asm changes from Ingo Molnar:
 "Two fixlets and a cleanup."

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86_32: Return actual stack when requesting sp from regs
  x86: Don't clobber top of pt_regs in nested NMI
  x86/asm: Clean up copy_page_*() comments and code

...

This commit is contained in:

Linus Torvalds 2012-12-11 19:55:20 -08:00

parent b64c5fda38 6c8d8b3c69

commit 0019fab355

3 changed files with 95 additions and 75 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

9

arch/x86/include/asm/ptrace.h

View file

41

arch/x86/kernel/entry_64.S

View file

114

arch/x86/lib/copy_page_64.S

View file