Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86...
Ingo Molnar [Tue, 24 Feb 2009 20:50:43 +0000 (21:50 +0100)]
1  2  3  4  5  6  7 
Makefile
arch/x86/kernel/acpi/wakeup_64.S
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/efi_stub_32.S
arch/x86/kernel/entry_64.S
arch/x86/kernel/traps.c
arch/x86/kernel/vmiclock_32.c

diff --cc Makefile
+++ b/Makefile
@@@@@@@@ -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 +1,7 @@@@@@@@
       VERSION = 2
       PATCHLEVEL = 6
       SUBLEVEL = 29
-      EXTRAVERSION = -rc4
 ----- EXTRAVERSION = -rc5
++++++ EXTRAVERSION = -rc6
       NAME = Erotic Pickled Herring
       
       # *DOCUMENTATION*
Simple merge
Simple merge
Simple merge
       #ifdef CONFIG_X86_64
       #include <asm/pgalloc.h>
       #include <asm/proto.h>
-     -#include <asm/pda.h>
       #else
       #include <asm/processor-flags.h>
- -----#include <asm/arch_hooks.h>
+ +++++#include <asm/setup.h>
       #include <asm/traps.h>
       
       #include "cpu/mcheck/mce.h"
@@@@@@@@ -906,16 -913,20 -913,20 -913,20 -913,20 -913,20 -914,19 +913,20 @@@@@@@@ void math_emulate(struct math_emu_info 
       }
       #endif /* CONFIG_MATH_EMULATION */
       
      -dotraplinkage void __kprobes do_device_not_available(struct pt_regs regs)
      +dotraplinkage void __kprobes
-      do_device_not_available(struct pt_regs *regs, long error)
+     +do_device_not_available(struct pt_regs *regs, long error_code)
       {
       #ifdef CONFIG_X86_32
        if (read_cr0() & X86_CR0_EM) {
+               struct math_emu_info info = { };
+      
      -         conditional_sti(&regs);
      +         conditional_sti(regs);
-               math_emulate(0);
+      
      -         info.regs = &regs;
+     +         info.regs = regs;
+               math_emulate(&info);
        } else {
                math_state_restore(); /* interrupts still off */
      -         conditional_sti(&regs);
      +         conditional_sti(regs);
        }
       #else
        math_state_restore();
@@@@@@@@ -286,7 -286,9 -286,7 -287,8 -287,9 -287,9 -287,9 +286,8 @@@@@@@@ static struct clocksource clocksource_v
       
       static cycle_t read_real_cycles(void)
       {
- -     return vmi_timer_ops.get_cycle_counter(VMI_CYCLES_REAL);
+ +     cycle_t ret = (cycle_t)vmi_timer_ops.get_cycle_counter(VMI_CYCLES_REAL);
 -  --- return ret >= clocksource_vmi.cycle_last ?
 -  ---         ret : clocksource_vmi.cycle_last;
+++ +++ return max(ret, clocksource_vmi.cycle_last);
       }
       
       static struct clocksource clocksource_vmi = {