Linus Torvalds d10902812c 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: (27 commits)
  x86: Clean up apic.c and apic.h
  x86: Remove superflous goal definition of tsc_sync
  x86: dt: Correct local apic documentation in device tree bindings
  x86: dt: Cleanup local apic setup
  x86: dt: Fix OLPC=y/INTEL_CE=n build
  rtc: cmos: Add OF bindings
  x86: ce4100: Use OF to setup devices
  x86: ioapic: Add OF bindings for IO_APIC
  x86: dtb: Add generic bus probe
  x86: dtb: Add support for PCI devices backed by dtb nodes
  x86: dtb: Add device tree support for HPET
  x86: dtb: Add early parsing of IO_APIC
  x86: dtb: Add irq domain abstraction
  x86: dtb: Add a device tree for CE4100
  x86: Add device tree support
  x86: e820: Remove conditional early mapping in parse_e820_ext
  x86: OLPC: Make OLPC=n build again
  x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
  x86: OLPC: Cleanup config maze completely
  x86: OLPC: Hide OLPC_OPENFIRMWARE config switch
  ...

Fix up conflicts in arch/x86/platform/ce4100/ce4100.c

2011-03-15 20:01:36 -07:00

..

acpi

Merge commit 'v2.6.38' into x86/mm

2011-03-15 08:29:44 +01:00

apic

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

2011-03-15 20:01:36 -07:00

cpu

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

2011-03-15 19:49:10 -07:00

.gitignore

…

alternative.c

x86: Fix text_poke_smp_batch() deadlock

2011-02-12 02:34:34 +01:00

amd_iommu_init.c

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

2010-10-21 14:23:48 -07:00

amd_iommu.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

amd_nb.c

x86: Adjust section placement in AMD northbridge related code

2011-02-10 13:32:52 +01:00

apb_timer.c

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

2011-03-15 20:01:36 -07:00

aperture_64.c

Merge branch 'linus' into x86/bootmem

2011-02-14 11:55:18 +01:00

apm_32.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

asm-offsets_32.c

x86: Partly unify asm-offsets_{32,64}.c

2011-02-10 13:31:37 +01:00

asm-offsets_64.c

x86: Partly unify asm-offsets_{32,64}.c

2011-02-10 13:31:37 +01:00

asm-offsets.c

x86, asm: Cleanup unnecssary macros in asm-offsets.c

2011-02-25 16:37:32 -08:00

audit_64.c

…

bootflag.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

check.c

x86: Don't check for BIOS corruption in first 64K when there's no need to

2011-03-09 16:36:41 +01:00

cpuid.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

crash_dump_32.c

mm: stack based kmap_atomic()

2010-10-26 16:52:08 -07:00

crash_dump_64.c

mm, x86: Saving vmcore with non-lazy freeing of vmas

2010-09-17 09:11:56 +02:00

crash.c

x86, UV: Make kdump avoid stack dumps

2010-07-21 11:33:27 -07:00

devicetree.c

x86: dt: Cleanup local apic setup

2011-02-25 16:18:52 +01:00

doublefault_32.c

x86: Use get_desc_base()

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

dumpstack_32.c

x86: Eliminate bp argument from the stack tracing routines

2010-11-18 14:37:34 +01:00

dumpstack_64.c

x86-64: Don't use pointer to out-of-scope variable in dump_trace()

2011-01-24 13:46:15 -08:00

dumpstack.c

x86: Remove die_nmi()

2011-02-18 08:54:05 +01:00

e820.c

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

2011-03-15 20:01:36 -07:00

early_printk.c

x86, earlyprintk: Move mrst early console to platform/ and fix a typo

2010-12-06 20:52:04 +01:00

early-quirks.c

x86 quirk: Fix polarity for IRQ0 pin2 override on SB800 systems

2011-02-24 20:30:21 +01:00

entry_32.S

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

2011-03-15 18:59:56 -07:00

entry_64.S

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

2011-03-15 19:49:10 -07:00

ftrace.c

ftrace/graph: Trace function entry before updating index

2011-03-10 10:34:43 -05:00

head32.c

x86: Add CE4100 platform support

2010-11-12 00:45:41 +01:00

head64.c

x86-64: Only set max_pfn_mapped to 512 MiB if we enter via head_64.S

2010-10-14 09:06:49 +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

2011-03-15 20:01:36 -07:00

head_64.S

x86-64: Simplify loading initial_gs

2010-07-21 21:23:51 -07:00

head.c

x86: Use memblock to replace early_res

2010-08-27 11:12:29 -07:00

hpet.c

x86: Cleanup the genirq name space

2011-03-12 14:12:00 +01:00

hw_breakpoint.c

x86: Use this_cpu_ops to optimize code

2010-12-30 12:20:28 +01:00

i386_ksyms_32.c

x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y

2009-10-01 08:42:24 +02:00

i387.c

KVM: Initialize fpu state in preemptible context

2011-01-12 12:02:26 +02:00

i8237.c

i8327: fix outb() parameter order

2009-02-10 13:13:23 +01:00

i8253.c

i8253: Convert i8253_lock to raw_spinlock

2010-03-02 10:28:38 +01:00

i8259.c

x86: Cleanup the genirq name space

2011-03-12 14:12:00 +01:00

init_task.c

Rename .data.cacheline_aligned to .data..cacheline_aligned.

2010-03-03 11:25:58 +01:00

io_delay.c

x86: io_delay.c cleanup

2009-03-21 16:57:04 +05:30

ioport.c

x86: Use bitmap library functions

2011-02-17 14:59:22 +01:00

irq_32.c

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

2011-01-18 14:29:21 -08:00

irq_64.c

x86: Unify fixup_irqs() for 32-bit and 64-bit kernels

2009-11-02 15:56:34 +01:00

irq_work.c

irq_work: Add generic hardirq context callbacks

2010-10-18 19:58:50 +02:00

irq.c

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

2011-03-15 20:01:36 -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

2011-03-15 20:01:36 -07:00

jump_label.c

jump label: x86 support

2010-09-22 16:33:03 -04:00

kdebugfs.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

kgdb.c

x86: Remove die_nmi()

2011-02-18 08:54:05 +01:00

kprobes.c

kprobes: Disabling optimized kprobes for entry text section

2011-03-08 17:22:12 +01:00

kvm.c

KVM guest: Fix kvm clock initialization when it's configured out

2011-01-12 11:30:56 +02:00

kvmclock.c

KVM paravirt: Move kvm_smp_prepare_boot_cpu() from kvmclock.c to kvm.c.

2011-01-12 11:23:10 +02:00

ldt.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

machine_kexec_32.c

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

2009-12-08 13:27:33 -08:00

machine_kexec_64.c

x86, cleanups: Use clear_page/copy_page rather than memset/memcpy

2010-09-22 15:36:49 -07:00

Makefile

x86: Remove superflous goal definition of tsc_sync

2011-03-11 08:13:59 +01:00

mca_32.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

microcode_amd.c

x86, microcode, AMD: Fix signedness bug in generic_load_microcode()

2011-02-20 14:01:32 +01:00

microcode_core.c

x86, microcode: Correct sysdev_add error path

2011-02-09 16:05:31 +01:00

microcode_intel.c

x86/microcode: Fix double vfree() and remove redundant pointer checks before vfree()

2010-12-27 14:33:30 +01:00

mmconf-fam10h_64.c

x86-64: Fix and clean up AMD Fam10 MMCONF enabling

2010-11-18 13:41:35 +01:00

module.c

mm: unify module_alloc code for vmalloc

2011-01-13 17:32:34 -08:00

mpparse.c

x86: Further simplify mp_irq info handling

2010-12-09 21:52:06 +01:00

msr.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

paravirt_patch_32.c

x86/pvops: add a paravirt_ident functions to allow special patching

2009-01-30 14:51:44 -08:00

paravirt_patch_64.c

x86/pvops: add a paravirt_ident functions to allow special patching

2009-01-30 14:51:44 -08:00

paravirt-spinlocks.c

locking: Convert __raw_spin* functions to arch_spin*

2009-12-14 23:55:32 +01:00

paravirt.c

thp: add pmd paravirt ops

2011-01-13 17:32:39 -08:00

pci-calgary_64.c

x86, calgary: Make Calgary IOMMU use IOMMU_INIT_* macros.

2010-08-26 15:14:15 -07:00

pci-dma.c

x86, iommu: Utilize the IOMMU_INIT macros functionality.

2010-08-26 15:14:52 -07:00

pci-gart_64.c

x86, amd-nb: Cleanup AMD northbridge caching code

2010-11-18 15:53:05 +01:00

pci-iommu_table.c

x86, iommu: Add proper dependency sort routine (and sanity check).

2010-08-26 15:13:19 -07:00

pci-nommu.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pci-swiotlb.c

x86, swiotlb: Make SWIOTLB use IOMMU_INIT_* macros.

2010-08-26 15:13:37 -07:00

pcspeaker.c

…

probe_roms_32.c

x86: move mach-default/*.h files to asm/

2009-01-29 14:16:51 +01:00

process_32.c

cpuidle/x86/perf: fix power:cpu_idle double end events and throw cpu_idle events from the cpuidle layer

2011-01-12 18:05:16 -05:00

process_64.c

cpuidle/x86/perf: fix power:cpu_idle double end events and throw cpu_idle events from the cpuidle layer

2011-01-12 18:05:16 -05:00

process.c

x86: Combine printk()s in show_regs_common()

2011-02-18 08:52:30 +01:00

ptrace.c

ptrace: cleanup arch_ptrace() on x86

2010-10-27 18:03:10 -07:00

pvclock.c

x86/pvclock: Zero last_value on resume

2010-11-28 09:33:20 +01:00

quirks.c

x86: HPET force enable for CX700 / VIA Epia LT

2010-09-15 16:27:04 +02:00

reboot_fixups_32.c

x86: Ce4100: Add reboot_fixup() for CE4100

2010-11-12 00:45:41 +01:00

reboot.c

x86: Fix reboot problem on VersaLogic Menlow boards

2011-02-21 08:41:26 +01:00

relocate_kernel_32.S

x86, kexec: fix kexec x86 coding style

2009-03-10 18:13:25 -07:00

relocate_kernel_64.S

x86, kexec: x86_64: add kexec jump support for x86_64

2009-03-10 18:13:25 -07:00

resource.c

x86: avoid high BIOS area when allocating address space

2010-12-17 10:01:30 -08:00

rtc.c

rtc: cmos: Add OF bindings

2011-02-23 22:27:55 +01:00

setup_percpu.c

x86: Unify CPU -> NUMA node mapping between 32 and 64bit

2011-01-28 14:54:09 +01:00

setup.c

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

2011-03-15 20:01:36 -07:00

signal.c

x86: Merge sys_sigaltstack

2009-12-09 16:28:59 -08:00

smp.c

x86, kexec: Make sure to stop all CPUs before exiting the kernel

2010-10-21 13:30:44 -07:00

smpboot.c

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

2011-03-15 19:49:10 -07:00

stacktrace.c

x86: Eliminate bp argument from the stack tracing routines

2010-11-18 14:37:34 +01:00

step.c

x86, ptrace: Fix block-step

2010-03-26 11:33:57 +01:00

sys_i386_32.c

i386: Make kernel_execve() suitable for stack unwinding

2010-09-03 08:16:02 +02:00

sys_x86_64.c

improve sys_newuname() for compat architectures

2010-03-12 15:52:32 -08:00

syscall_64.c

…

syscall_table_32.S

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

2011-03-15 18:53:35 -07:00

tboot.c

thp: pte alloc trans splitting

2011-01-13 17:32:40 -08:00

tce_64.c

…

test_nx.c

…

test_rodata.c

…

time.c

x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog

2010-11-18 09:08:23 +01:00

tls.c

…

tls.h

…

topology.c

x86: topology.c cleanup

2009-03-21 16:55:24 +05:30

trampoline_32.S

x86: cpuinit-annotate SMP boot trampolines properly

2009-09-20 20:23:37 +02:00

trampoline_64.S

x86, cpu: Rename verify_cpu_64.S to verify_cpu.S

2010-11-10 15:42:42 -08:00

trampoline.c

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

2010-10-22 20:37:50 -07:00

traps.c

x86, NMI: Clean-up default_do_nmi()

2011-01-07 15:08:53 +01:00

tsc_sync.c

locking: Convert __raw_spin* functions to arch_spin*

2009-12-14 23:55:32 +01:00

tsc.c

Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-01-15 12:45:00 -08:00

verify_cpu.S

x86: Fix included-by file reference comments

2010-11-18 09:58:54 +01:00

vm86_32.c

thp: split_huge_page_mm/vma

2011-01-13 17:32:41 -08:00

vmlinux.lds.S

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

2011-03-15 18:59:56 -07:00

vsmp_64.c

Revert "x86: don't compile vsmp_64 for 32bit"

2009-03-25 21:34:28 +01:00

vsyscall_64.c

timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset

2010-07-27 12:40:54 +02:00

x86_init.c

x86/platform: Add a wallclock_init func to x86_init.timers ops

2011-02-14 18:20:43 +01:00

x8664_ksyms_64.c

x86-64, mem: Convert memmove() to assembly file and fix return value bug

2011-01-25 16:58:39 -08:00

xsave.c

x86, xsave: Use alloc_bootmem_align() instead of alloc_bootmem()

2010-12-13 16:13:11 -08:00