Merge branches 'x86/mmio', 'x86/delay', 'x86/idle', 'x86/oprofile', 'x86/debug',...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
index 5d28581,dcbec34,e0edaaa,52e18e6,e0edaaa,e0edaaa,b120cff..7dc46ba
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
--- 3/arch/x86/Kconfig
--- 4/arch/x86/Kconfig
--- 5/arch/x86/Kconfig
--- 6/arch/x86/Kconfig
--- 7/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/Makefile
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/pci-dma.c
Simple merge

diff --cc arch/x86/kernel/tsc_32.c
index 774a5a8,068759d,0065426,65b7063,65b7063,65b7063,65b7063..6240922
--- 1/arch/x86/kernel/tsc_32.c
--- 2/arch/x86/kernel/tsc_32.c
--- 3/arch/x86/kernel/tsc_32.c
--- 4/arch/x86/kernel/tsc_32.c
--- 5/arch/x86/kernel/tsc_32.c
--- 6/arch/x86/kernel/tsc_32.c
--- 7/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);

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc include/asm-x86/cpufeature.h
Simple merge

diff --cc include/asm-x86/gart.h
Simple merge