x86 fixes for 2.6.31
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
tglx
------------------>
Dave Jones (1):
x86: Fix warning in pvclock.c
Rakib Mullick (2):
x86: Fix false positive section mismatch in es7000_32.c x86, apic: Fix false positive section mismatch in numaq_32.c
Roland Dreier (1):
x86: Remove spurious printk level from segfault message
arch/x86/kernel/apic/es7000_32.c | 3 ++- arch/x86/kernel/apic/numaq_32.c | 3 ++- arch/x86/kernel/pvclock.c | 2 +- arch/x86/mm/fault.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/kernel/apic/es7000_32.c +2 -1
@@ -652,7 +652,8 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,return ret &&es7000_apic_is_cluster (); } -struct apic apic_es7000_cluster = { +/* We've been warned by a false positive warning.Use __refdata to keep calm. */ +struct apic __refdata apic_es7000_cluster = { .name ="es7000" , .probe = probe_es7000,
arch/x86/kernel/apic/numaq_32.c +2 -1
@@ -493,7 +493,8 @@ static void numaq_setup_portio_remap(void) (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD); } -struct apic apic_numaq = { +/* Use __refdata to keep false positive warning calm. */ +struct apic __refdata apic_numaq = { .name ="NUMAQ" , .probe = probe_numaq,
arch/x86/kernel/pvclock.c +1 -1
@@ -60,7 +60,7 @@ static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift) "adc %5,%%edx ; " : "=A" (product), "=r" (tmp1), "=r" (tmp2) : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); -#elif __x86_64__ +#elif defined(__x86_64__) __asm__ ("mul %%rdx ; shrd $32,%%rdx,%%rax" :"=a" (product) :"0" (delta),"d" ((u64 )mul_frac) );
arch/x86/mm/fault.c +1 -1
@@ -697,7 +697,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code,if (!printk_ratelimit ())return ; -printk (KERN_CONT "%s%s[%d]: segfault at %lx ip %p sp %p error %lx" , +printk ("%s%s[%d]: segfault at %lx ip %p sp %p error %lx" ,task_pid_nr (tsk) >1 ?KERN_INFO :KERN_EMERG , tsk->comm,task_pid_nr (tsk), address, (void *)regs->ip, (void *)regs->sp, error_code);