From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 8 Jul 2008 07:46:15 +0000 (+0200)
Subject: Merge branches 'x86/mmio', 'x86/delay', 'x86/idle', 'x86/oprofile', 'x86/debug',... 
X-Git-Tag: v2.6.27-rc1~1106^2~249
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58cf35228fec541418cc3bd781d6c069d904815e;p=linux-2.6

Merge branches 'x86/mmio', 'x86/delay', 'x86/idle', 'x86/oprofile', 'x86/debug', 'x86/ptrace' and 'x86/amd-iommu' into x86/devel
---

58cf35228fec541418cc3bd781d6c069d904815e
diff --cc arch/x86/Kconfig
index 5d28581199,dcbec34154,e0edaaa692,52e18e6d2b,e0edaaa692,e0edaaa692,b120cffae1..7dc46ba26f
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@@@@@@ -411,14 -410,10 -411,14 -410,10 -411,14 -411,14 -411,14 +411,14 @@@@@@@@ config PARAVIR
       	  over full virtualization.  However, when run without a hypervisor
       	  the kernel is theoretically slower and slightly larger.
       
 + +   config PARAVIRT_CLOCK
 + +   	bool
 + +   	default n
 + +   
       endif
       
 ------config MEMTEST_BOOTPARAM
 ------	bool "Memtest boot parameter"
 ++++++config MEMTEST
 ++++++	bool "Memtest"
       	depends on X86_64
       	default y
       	help
diff --cc arch/x86/kernel/tsc_32.c
index 774a5a83c2,068759db63,0065426f15,65b70637ad,65b70637ad,65b70637ad,65b70637ad..6240922e49
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@@@@@@@ -403,9 -401,12 -405,10 -404,9 -404,9 -404,9 -404,9 +404,10 @@@@@@@@ static inline void check_geode_tsc_reli
       void __init tsc_init(void)
       {
       	int cpu;
++ ++++	u64 lpj;
       
 -     	if (!cpu_has_tsc || tsc_disabled) {
 -     		/* Disable the TSC in case of !cpu_has_tsc */
 -     		tsc_disabled = 1;
 +     	if (!cpu_has_tsc || tsc_disabled > 0)
       		return;
 -     	}
       
       	cpu_khz = calculate_cpu_khz();
       	tsc_khz = cpu_khz;
@@@@@@@@ -415,9 -416,11 -418,13 -416,9 -416,9 -416,9 -416,9 +417,13 @@@@@@@@
       		return;
       	}
       
++ ++++	lpj = ((u64)tsc_khz * 1000);
++ ++++	do_div(lpj, HZ);
++ ++++	lpj_fine = lpj;
++ ++++
 +     	/* now allow native_sched_clock() to use rdtsc */
 +     	tsc_disabled = 0;
 +     
       	printk("Detected %lu.%03lu MHz processor.\n",
       				(unsigned long)cpu_khz / 1000,
       				(unsigned long)cpu_khz % 1000);