x86/debug for v2.6.37
Linus,
Please pull the latest x86-debug-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-debug-for-linus
Thanks,
Ingo
------------------>
Jan Beulich (5):
x86-64: Fix unwind annotations in syscall stubs
x86-64: Adjust frame type at paranoid_exit:
x86-64: Use symbolics instead of raw numbers in entry_64.S
i386: Add unwind directives to syscall ptregs stubs
x86: Use {push,pop}{l,q}_cfi in more places
Jin Dongming (1):
therm_throt.c: Trivial printk message fix for a unsuitable abbreviation of 'thermal'
Joe Perches (1):
x86: Remove pr_<level> uses of KERN_<level>
arch/x86/include/asm/dwarf2.h | 20 ++ arch/x86/kernel/apb_timer.c | 4 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 +- arch/x86/kernel/entry_32.S | 310 +++++++++++------------------- arch/x86/kernel/entry_64.S | 108 +++++------ 5 files changed, 177 insertions(+), 267 deletions(-)
arch/x86/include/asm/dwarf2.h +20 -0
@@ -89,6 +89,16 @@CFI_ADJUST_CFA_OFFSET -8 .endm + .macro pushfq_cfi + pushfq + CFI_ADJUST_CFA_OFFSET 8 + .endm + + .macro popfq_cfi + popfq + CFI_ADJUST_CFA_OFFSET -8 + .endm + .macro movq_cfi reg offset=0 movq %\reg, \offset(%rsp) CFI_REL_OFFSET \reg, \offset
@@ -109,6 +119,16 @@CFI_ADJUST_CFA_OFFSET -4 .endm + .macro pushfl_cfi + pushfl + CFI_ADJUST_CFA_OFFSET 4 + .endm + + .macro popfl_cfi + popfl + CFI_ADJUST_CFA_OFFSET -4 + .endm + .macro movl_cfi reg offset=0 movl %\reg, \offset(%esp) CFI_REL_OFFSET \reg, \offset
arch/x86/kernel/apb_timer.c +2 -2
@@ -398,7 +398,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n, }break ;default : -pr_debug (KERN_INFO "APBT notified %lu, no action\n" , action); +pr_debug ("APBT notified %lu, no action\n" , action); }return NOTIFY_OK ; }
@@ -552,7 +552,7 @@ bad_count:pr_debug ("APB CS going back %lx:%lx:%lx " , t2, last_read, t2 - last_read); bad_count_x3: -pr_debug (KERN_INFO "tripple check enforced\n" ); +pr_debug ("triple check enforced\n" ); t0 =apbt_readl (phy_cs_timer_id,APBTMR_N_CURRENT_VALUE );udelay (1 );
arch/x86/kernel/cpu/mcheck/therm_throt.c +1 -1
@@ -348,7 +348,7 @@ static void intel_thermal_interrupt(void)static void unexpected_thermal_interrupt (void ) { -printk (KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n" , +printk (KERN_ERR "CPU%d: Unexpected LVT thermal interrupt!\n" ,smp_processor_id ());add_taint (TAINT_MACHINE_CHECK ); }
arch/x86/kernel/entry_32.S +110 -200
649 lines not on this page · raw message
arch/x86/kernel/entry_64.S +44 -64
268 lines not on this page · raw message