• Linus Torvalds's avatar
    Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 · 60812a4a
    Linus Torvalds authored
    * ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (33 commits)
      x86: convert cpuinfo_x86 array to a per_cpu array
      x86: introduce frame_pointer() and stack_pointer()
      x86 & generic: change to __builtin_prefetch()
      i386: do not BUG_ON() when MSR is unknown
      x86: acpi use cpu_physical_id
      x86: convert cpu_llc_id to be a per cpu variable
      x86: convert cpu_to_apicid to be a per cpu variable
      i386: introduce "used_vectors" bitmap which can be used to reserve vectors.
      x86: use raw locks during oopses
      x86: honor _PAGE_PSE bit on page walks
      i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE.
      x86: implement missing x86_64 function smp_call_function_mask()
      x86: use descriptor's functions instead of inline assembly
      i386: consolidate show_regs and show_registers for i386
      i386: make callgraph use dump_trace() on i386/x86_64
      x86: enable iommu_merge by default
      i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h
      x86: Unify i386 and x86-64 early quirks
      x86: enable HPET on ICH3 and ICH4
      x86: force enable HPET on VT8235/8237 chipsets
      ...
    
    Manually fix trivial conflict with task pid container helper changes in
    arch/x86/kernel/process_32.c
    60812a4a
fault_32.c 16.9 KB