From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 28 Aug 2008 02:17:07 +0000 (-0700)
Subject: Merge branch 'x86/urgent' into x86/cpu
X-Git-Tag: v2.6.28-rc1~699^2^8~5^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b30a72a7edfc64c8929104d5c2178aca489aa559;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/urgent' into x86/cpu

Conflicts:

	arch/x86/kernel/cpu/cyrix.c
---

b30a72a7edfc64c8929104d5c2178aca489aa559
diff --cc arch/x86/kernel/cpu/cyrix.c
index db5868cd244,e710a21bb6e..ada50505a5c
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@@ -131,26 -131,9 +131,9 @@@ static void __cpuinit set_cx86_memwb(vo
  	/* set 'Not Write-through' */
  	write_cr0(read_cr0() | X86_CR0_NW);
  	/* CCR2 bit 2: lock NW bit and set WT1 */
 -	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14);
 +	setCx86_old(CX86_CCR2, getCx86_old(CX86_CCR2) | 0x14);
  }
  
- static void __cpuinit set_cx86_inc(void)
- {
- 	unsigned char ccr3;
- 
- 	printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n");
- 
- 	ccr3 = getCx86(CX86_CCR3);
- 	setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
- 	/* PCR1 -- Performance Control */
- 	/* Incrementor on, whatever that is */
- 	setCx86_old(CX86_PCR1, getCx86_old(CX86_PCR1) | 0x02);
- 	/* PCR0 -- Performance Control */
- 	/* Incrementor Margin 10 */
- 	setCx86_old(CX86_PCR0, getCx86_old(CX86_PCR0) | 0x04);
- 	setCx86(CX86_CCR3, ccr3);	/* disable MAPEN */
- }
- 
  /*
   *	Configure later MediaGX and/or Geode processor.
   */