From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 24 Feb 2009 20:50:43 +0000 (+0100)
Subject: Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86... 
X-Git-Tag: upstream/snapshot3+hdmi~18692^2~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a852cbfaaf8122827602027b1614971cfd832304;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core
---

a852cbfaaf8122827602027b1614971cfd832304
diff --cc Makefile
index 681c1d2,96628d0,b280cfc,96628d0,96628d0,96628d0,df6ce3e..27fb890
--- a/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*
diff --cc arch/x86/kernel/traps.c
index 98c2d055,c8c0a7e,acb8c05,2df927b,acb8c05,acb8c05,a9e7548..c05430a
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@@@@@@ -59,10 -59,9 -59,9 -59,9 -59,9 -59,9 -59,10 +59,9 @@@@@@@@
       #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();
diff --cc arch/x86/kernel/vmiclock_32.c
index c4c1f9e,49b4cd6,a4791ef,b77ad57,9cd28c0,9cd28c0,e5b088f..33a788d
--- a/arch/x86/kernel/vmiclock_32.c
+++ b/arch/x86/kernel/vmiclock_32.c
@@@@@@@@ -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 = {