Linus Torvalds 78f28b7c55 Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ...

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
  x86: Move get/set_wallclock to x86_platform_ops
  x86: platform: Fix section annotations
  x86: apic namespace cleanup
  x86: Distangle ioapic and i8259
  x86: Add Moorestown early detection
  x86: Add hardware_subarch ID for Moorestown
  x86: Add early platform detection
  x86: Move tsc_init to late_time_init
  x86: Move tsc_calibration to x86_init_ops
  x86: Replace the now identical time_32/64.c by time.c
  x86: time_32/64.c unify profile_pc
  x86: Move calibrate_cpu to tsc.c
  x86: Make timer setup and global variables the same in time_32/64.c
  x86: Remove mca bus ifdef from timer interrupt
  x86: Simplify timer_ack magic in time_32.c
  x86: Prepare unification of time_32/64.c
  x86: Remove do_timer hook
  x86: Add timer_init to x86_init_ops
  x86: Move percpu clockevents setup to x86_init_ops
  x86: Move xen_post_allocator_init into xen_pagetable_setup_done
  ...

Fix up conflicts in arch/x86/include/asm/io_apic.h

2009-09-18 14:05:47 -07:00

..

acpi

Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 into x86/apic

2009-08-29 09:31:47 +02:00

apic

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

cpu

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

.gitignore

…

alternative.c

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-14 07:57:32 -07:00

amd_iommu_init.c

Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32

2009-09-03 16:34:23 +02:00

amd_iommu.c

Merge branch 'amd-iommu/pagetable' into amd-iommu/2.6.32

2009-09-03 17:14:57 +02:00

aperture_64.c

kmemleak: Ignore the aperture memory hole on x86_64

2009-09-01 11:12:32 +01:00

apm_32.c

Merge commit 'origin/x86/urgent' into x86/asm

2009-08-25 15:40:29 -07:00

asm-offsets_32.c

lguest: optimize by coding restore_flags and irq_enable in assembler.

2009-06-12 22:27:03 +09:30

asm-offsets_64.c

tracing: Define NR_syscalls for x86_64

2009-08-26 21:29:58 +02:00

asm-offsets.c

…

audit_64.c

…

bios_uv.c

x86, UV: system table in bios accessed after unmap

2009-04-03 19:25:57 +02:00

bootflag.c

…

check.c

…

cpuid.c

Driver Core: x86: add nodename for cpuid and msr drivers.

2009-06-15 21:30:25 -07:00

crash_dump_32.c

…

crash_dump_64.c

…

crash.c

x86: disable IOMMUs on kernel crash

2009-06-15 15:20:40 +02:00

doublefault_32.c

x86: Use get_desc_base()

2009-07-19 18:27:51 +02:00

ds_selftest.c

x86, ds: fix buffer alignment in debug store selftest

2009-04-24 10:18:51 +02:00

ds_selftest.h

…

ds.c

x86: ds.c fix invalid assignment

2009-06-20 17:53:13 +02:00

dumpstack_32.c

perf_counter: Ignore the nmi call frames in the x86-64 backtraces

2009-07-01 22:37:23 +02:00

dumpstack_64.c

perf_counter: Ignore the nmi call frames in the x86-64 backtraces

2009-07-01 22:37:23 +02:00

dumpstack.c

x86: Remove duplicated #include

2009-07-11 10:17:08 +02:00

dumpstack.h

x86: avoid multiple declaration of kstack_depth_to_print

2009-04-14 11:45:33 +02:00

e820.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

early_printk.c

…

early-quirks.c

x86 early quirks: eliminate unused function

2009-04-08 14:16:32 +02:00

efi_32.c

…

efi_64.c

x86: Make 64-bit efi_ioremap use ioremap on MMIO regions

2009-08-03 13:34:25 -07:00

efi_stub_32.S

…

efi_stub_64.S

…

efi.c

x86: Move get/set_wallclock to x86_platform_ops

2009-09-16 14:34:50 +02:00

entry_32.S

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-06-20 10:56:46 -07:00

entry_64.S

tracing/function-graph: x86_64 stack allocation cleanup

2009-09-12 22:13:43 -04:00

ftrace.c

tracing: Convert event tracing code to use NR_syscalls

2009-08-26 21:30:02 +02:00

geode_32.c

…

head32.c

x86: Add Moorestown early detection

2009-08-31 11:09:40 +02:00

head64.c

x86: Add early platform detection

2009-08-31 11:09:40 +02:00

head_32.S

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

head_64.S

x86: de-assembler-ize asm/desc.h

2009-06-17 21:35:10 -07:00

head.c

…

hpet.c

x86: hpet: Mark per cpu interrupts IRQF_TIMER to prevent resume failure

2009-06-14 18:24:29 +02:00

i386_ksyms_32.c

…

i387.c

…

i8237.c

…

i8253.c

x86: Do not unregister PIT clocksource on PIT oneshot setup/shutdown

2009-08-21 21:13:37 +02:00

i8259.c

…

init_task.c

mm: consolidate init_mm definition

2009-06-16 19:47:28 -07:00

io_delay.c

…

ioport.c

…

irq_32.c

x86: Use printk_once()

2009-08-09 22:28:34 +02:00

irq_64.c

…

irq.c

x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE

2009-07-09 18:39:47 -07:00

irqinit.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

k8.c

…

kdebugfs.c

…

kgdb.c

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-06-10 15:49:10 -07:00

kprobes.c

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-02 00:49:02 +02:00

kvm.c

KVM guest: do not batch pte updates from interrupt context

2009-09-10 18:10:50 +03:00

kvmclock.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

ldt.c

…

machine_kexec_32.c

x86, kexec: fix crashdump panic with CONFIG_KEXEC_JUMP

2009-05-07 22:01:05 -07:00

machine_kexec_64.c

x86, kexec: fix crashdump panic with CONFIG_KEXEC_JUMP

2009-05-07 22:01:05 -07:00

Makefile

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

mca_32.c

…

mfgpt_32.c

x86: geode: Mark mfgpt irq IRQF_TIMER to prevent resume failure

2009-07-24 08:42:52 +02:00

microcode_amd.c

x86, microcode: Simplify vfree() use

2009-06-07 16:35:11 +02:00

microcode_core.c

Driver Core: misc: add nodename support for misc devices.

2009-06-15 21:30:25 -07:00

microcode_intel.c

x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic

2009-05-12 10:36:44 +02:00

mmconf-fam10h_64.c

…

module.c

module: cleanup FIXME comments about trimming exception table entries.

2009-06-12 21:47:05 +09:30

mpparse.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

mrst.c

x86: Add Moorestown early detection

2009-08-31 11:09:40 +02:00

msr.c

x86, msr: Export the register-setting MSR functions via /dev/*/msr

2009-08-31 16:16:04 -07:00

olpc.c

…

paravirt_patch_32.c

…

paravirt_patch_64.c

…

paravirt-spinlocks.c

…

paravirt.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

pci-calgary_64.c

x86: calgary: remove IOMMU_DEBUG

2009-04-14 13:03:36 +02:00

pci-dma.c

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2009-09-16 07:49:54 -07:00

pci-gart_64.c

x86: replace is_buffer_dma_capable() with dma_capable

2009-07-28 14:19:19 +09:00

pci-nommu.c

dma-ops: Remove flush_write_buffers() in dma-mapping-common.h

2009-08-10 09:34:57 +02:00

pci-swiotlb.c

x86: remove unused swiotlb_phys_to_bus() and swiotlb_bus_to_phys()

2009-07-28 14:19:20 +09:00

pcspeaker.c

…

pmtimer_64.c

…

probe_roms_32.c

…

process_32.c

Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-14 08:01:28 -07:00

process_64.c

Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-14 08:01:28 -07:00

process.c

clockevent: Prevent dead lock on clockevents_lock

2009-08-19 18:15:10 +02:00

ptrace.c

tracing: Create generic syscall TRACE_EVENTs

2009-08-26 00:41:48 +02:00

pvclock.c

x86: Fix warning in pvclock.c

2009-07-14 16:25:05 +02:00

quirks.c

x86/PCI: pci quirks, fix pci refcounting

2009-09-09 14:11:02 -07:00

reboot_fixups_32.c

…

reboot.c

Merge commit 'v2.6.31-rc8' into x86/txt

2009-09-02 08:17:56 +02:00

relocate_kernel_32.S

…

relocate_kernel_64.S

…

rtc.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

scx200_32.c

…

setup_percpu.c

x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA

2009-08-14 15:00:52 +09:00

setup.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

signal.c

Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-17 21:07:08 -07:00

smp.c

Merge branch 'linus' into x86/mce3

2009-06-11 23:31:52 +02:00

smpboot.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

stacktrace.c

x86: add save_stack_trace_bp() for tracing from a specific stack frame

2009-06-12 23:01:05 +02:00

step.c

x86: Use get_desc_base()

2009-07-19 18:27:51 +02:00

sys_i386_32.c

…

sys_x86_64.c

tracing: Convert x86_64 mmap and uname to use DEFINE_SYSCALL

2009-08-11 20:35:29 +02:00

syscall_64.c

…

syscall_table_32.S

Merge branch 'core/signal' into perfcounters/core

2009-04-30 21:16:49 +02:00

tboot.c

x86, intel_txt: clean up the impact on generic code, unbreak non-x86

2009-09-01 18:25:07 -07:00

tce_64.c

…

test_nx.c

…

test_rodata.c

…

time.c

x86: platform: Fix section annotations

2009-09-16 10:21:10 +02:00

tlb_uv.c

x86: uv: Clean up uv_ptc_init(), use proc_create()

2009-08-24 12:26:46 +02:00

tls.c

…

tls.h

…

topology.c

…

trampoline_32.S

…

trampoline_64.S

…

trampoline.c

…

traps.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

tsc_sync.c

x86: clean up arch/x86/kernel/tsc_sync.c a bit

2009-05-07 09:32:10 +02:00

tsc.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-18 14:05:47 -07:00

uv_irq.c

…

uv_sysfs.c

x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems

2009-04-08 14:58:10 +02:00

uv_time.c

uv_time: add parameter to uv_read_rtc()

2009-04-22 17:41:25 +02:00

verify_cpu_64.S

…

visws_quirks.c

x86: Add timer_init to x86_init_ops

2009-08-31 09:35:46 +02:00

vm86_32.c

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-06-10 16:15:14 -07:00

vmi_32.c

x86: Move get/set_wallclock to x86_platform_ops

2009-09-16 14:34:50 +02:00

vmiclock_32.c

x86: Move tsc_calibration to x86_init_ops

2009-08-31 09:35:47 +02:00

vmlinux.lds.S

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2009-09-15 09:39:44 -07:00

vsmp_64.c

…

vsyscall_64.c

time: Introduce CLOCK_REALTIME_COARSE

2009-08-21 21:43:46 +02:00

x86_init.c

x86: Move get/set_wallclock to x86_platform_ops

2009-09-16 14:34:50 +02:00

x8664_ksyms_64.c

…

xsave.c

x86-64: fix FPU corruption with signals and preemption

2009-04-20 14:33:00 -07:00