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

Browse source

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Remove pr_<level> uses of KERN_<level>
  therm_throt.c: Trivial printk message fix for a unsuitable abbreviation of 'thermal'
  x86: Use {push,pop}{l,q}_cfi in more places
  i386: Add unwind directives to syscall ptregs stubs
  x86-64: Use symbolics instead of raw numbers in entry_64.S
  x86-64: Adjust frame type at paranoid_exit:
  x86-64: Fix unwind annotations in syscall stubs

...

This commit is contained in:

Linus Torvalds 2010-10-21 13:20:32 -07:00

parent bf70030dc0 d0ed0c3266

commit 214515b578

5 changed files with 177 additions and 267 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

20

arch/x86/include/asm/dwarf2.h

View file

4

arch/x86/kernel/apb_timer.c

View file

2

arch/x86/kernel/cpu/mcheck/therm_throt.c

View file

310

arch/x86/kernel/entry_32.S

View file

108

arch/x86/kernel/entry_64.S

View file