Ingo Molnar f0ef039851 Merge branch 'x86/core' into tracing/textedit ...

Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-03-06 16:45:01 +01:00

..

native

ia64/pv_ops: paravirtualized instruction checker.

2008-10-17 10:12:54 -07:00

sn

[IA64] bte_copy of BTE_MAX_XFER trips BUG_ON.

2009-02-19 11:29:31 -08:00

uv

SGI IA64 UV: fix ia64 build error in the linux-next tree

2009-02-11 13:31:47 +01:00

xen

ia64/pv_ops/xen: define the nubmer of irqs which xen needs.

2008-10-17 10:06:59 -07:00

acpi-ext.h

ACPI: remove private acpica headers from driver files

2008-12-31 01:15:22 -05:00

acpi.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

agp.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

asmmacro.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

atomic.h

atomic_t: unify all arch definitions

2009-01-06 15:59:10 -08:00

auxvec.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

bitops.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

break.h

ia64/xen: reserve "break" numbers used for xen hypercalls.

2008-10-17 09:52:52 -07:00

bug.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

bugs.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

byteorder.h

byteorder: make swab.h include asm/swab.h like a regular header

2009-01-14 19:56:50 -08:00

cache.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cacheflush.h

[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU

2008-10-17 12:14:13 -07:00

checksum.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

compat.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cpu.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cputime.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

current.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

cyclone.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

delay.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

device.h

[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU

2008-10-17 12:14:13 -07:00

div64.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

dma-mapping.h

[IA64] SN specific version of dma_get_required_mask()

2009-01-15 10:42:16 -08:00

dma.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

dmi.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

elf.h

[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY

2008-10-16 15:40:05 +02:00

emergency-restart.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

errno.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

esi.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fb.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fcntl.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fpswa.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

fpu.h

Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h

2009-02-06 20:46:06 +05:30

ftrace.h

ftrace, ia64: IA64 dynamic ftrace support

2009-01-14 12:11:31 +01:00

futex.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

gcc_intrin.h

headers_check fix: ia64, gcc_intrin.h

2009-02-01 11:01:24 +05:30

hardirq.h

preempt-count: force hardirq-count to max of 10

2009-02-12 11:19:05 -05:00

hpsim.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

hugetlb.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

hw_irq.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ia32.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ia64regs.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

intel_intrin.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

intrinsics.h

headers_check fix: ia64, intrinsics.h

2009-02-01 11:01:25 +05:30

io.h

[IA64] remove dead BIO_VMERGE_BOUNDARY definition

2008-11-04 11:31:58 -08:00

ioctl.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ioctls.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

iommu.h

x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI

2008-10-24 11:09:43 -07:00

iosapic.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ipcbuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

irq_regs.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

irq.h

ia64: cpumask fix for is_affinity_mask_valid()

2009-01-04 15:39:24 +01:00

Kbuild

byteorder: make swab.h include asm/swab.h like a regular header

2009-01-14 19:56:50 -08:00

kdebug.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

kexec.h

kexec jump: rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE

2008-08-15 08:35:42 -07:00

kmap_types.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

kprobes.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

kregs.h

[IA64] Fix annoying IA64_TR_ALLOC_MAX message.

2008-10-17 13:47:53 -07:00

kvm_host.h

KVM: change KVM to use IOMMU API

2009-01-03 14:11:07 +01:00

kvm_para.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

kvm.h

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

libata-portmap.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

linkage.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

local.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_dig_vtd.h

[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU

2008-10-17 12:14:13 -07:00

machvec_dig.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_hpsim.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_hpzx1_swiotlb.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_hpzx1.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_init.h

[IA64] SN specific version of dma_get_required_mask()

2009-01-15 10:42:16 -08:00

machvec_sn2.h

[IA64] SN specific version of dma_get_required_mask()

2009-01-15 10:42:16 -08:00

machvec_uv.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

machvec_xen.h

ia64/xen: define xen machine vector for domU.

2008-10-17 10:08:56 -07:00

machvec.h

[IA64] SN specific version of dma_get_required_mask()

2009-01-15 10:42:16 -08:00

mc146818rtc.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mca_asm.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mca.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

meminit.h

[IA64] fix the difference between node_mem_map and node_start_pfn

2008-11-04 11:31:12 -08:00

mman.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mmu_context.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mmu.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mmzone.h

mm: clean up for early_pfn_to_nid()

2009-02-18 15:37:55 -08:00

module.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

msgbuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

mutex.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

nodedata.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

numa.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

page.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

pal.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

param.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

paravirt_privop.h

[IA64] remove BUILD_BUG_ON from paravirt_getreg()

2008-12-09 10:01:26 -08:00

paravirt.h

ia64/pv_ops: avoid name conflict of get_irq_chip().

2008-10-17 09:50:55 -07:00

parport.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

patch.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

pci.h

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

2008-10-23 08:07:35 -07:00

percpu.h

percpu: make PER_CPU_BASE_SECTION overridable by arches

2009-02-09 10:30:29 +01:00

perfmon_default_smpl.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

perfmon.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

pgalloc.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

pgtable.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

poll.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

posix_types.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

processor.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ptrace_offsets.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ptrace.h

remove __ARCH_WANT_COMPAT_SYS_PTRACE

2008-11-30 11:00:15 -08:00

pvclock-abi.h

ia64/xen: add a necessary header file to compile include/xen/interface/xen.h

2008-10-17 09:57:28 -07:00

resource.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

rse.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

rwsem.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sal.h

[IA64] Add error_recovery_info field to SAL section header

2008-11-04 11:30:43 -08:00

scatterlist.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sections.h

[IA64] Put the space for cpu0 per-cpu area into .data section

2008-09-29 16:39:19 -07:00

segment.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sembuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

serial.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

setup.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

shmbuf.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

shmparam.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sigcontext.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

siginfo.h

signals: demultiplexing SIGTRAP signal

2008-09-23 13:26:52 +02:00

signal.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

smp.h

cpumask: centralize cpu_online_map and cpu_possible_map

2008-12-13 21:19:41 +10:30

socket.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sockios.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

sparsemem.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

spinlock_types.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

spinlock.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

stat.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

statfs.h

IA64: Use <asm-generic/statfs.h>

2008-09-04 09:46:13 +01:00

string.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

suspend.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

swab.h

headers_check fix: ia64, swab.h

2009-02-01 11:01:25 +05:30

swiotlb.h

swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h

2008-12-28 10:04:00 +01:00

sync_bitops.h

ia64/xen: introduce sync bitops which is necessary for ia64/xen support.

2008-10-17 09:53:33 -07:00

syscall.h

[IA64] utrace Convert compat ptrace to use compat_sys_ptrace

2008-10-06 10:45:29 -07:00

system.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

termbits.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

termios.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

thread_info.h

[IA64] utrace use generic trace hook

2008-10-06 10:43:06 -07:00

timex.h

ia64: move function declaration, ia64_cpu_local_tick() from .c to .h

2008-10-17 09:52:08 -07:00

tlb.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

tlbflush.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

topology.h

sched: fix warning on ia64

2009-01-15 21:15:43 +01:00

types.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

uaccess.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ucontext.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

unaligned.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

uncached.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

unistd.h

[CVE-2009-0029] Remove __attribute__((weak)) from sys_pipe/sys_pipe2

2009-01-14 14:15:15 +01:00

unwind.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

user.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

ustack.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

vga.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00

xor.h

[IA64] Move include/asm-ia64 to arch/ia64/include/asm

2008-08-01 10:21:21 -07:00