Ingo Molnar 1c2a48cf65 Merge branch 'linus' into x86/apic-cleanups ...

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: Resolve the conflict, update to a more recent -rc base

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

2011-01-07 14:14:15 +01:00

..

kmemcheck

x86: Eliminate bp argument from the stack tracing routines

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

amdtopology_64.c

x86, apic: Remove early_init_lapic_mapping()

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

dump_pagetables.c

x86, mm: Create symbolic index into address_markers array

2010-07-20 16:56:19 -07:00

extable.c

x86, 64-bit: Move K8 B step iret fixup to fault entry asm

2009-10-12 18:29:46 +02:00

fault.c

x86: access_error API cleanup

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

gup.c

x86, doc: Fix minor spelling error in arch/x86/mm/gup.c

2010-02-02 16:00:44 -08:00

highmem_32.c

mm: fix race in kunmap_atomic()

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

hugetlbpage.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

init_32.c

x86: Add NX protection for kernel data

2010-11-18 12:52:04 +01:00

init_64.c

x86: Resume trampoline must be executable

2010-11-22 14:38:52 +01:00

init.c

x86: Add NX protection for kernel data

2010-11-18 12:52:04 +01:00

iomap_32.c

mm: fix race in kunmap_atomic()

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

ioremap.c

xen: Cope with unmapped pages when initializing kernel pagetable

2010-10-13 16:07:13 -07:00

kmmio.c

x86, kmmio/mmiotrace: Fix double free of kmmio_fault_pages

2010-06-18 11:30:09 +02:00

Makefile

x86, amd-nb: Complete the rename of AMD NB and related code

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

memblock.c

x86, memblock: Remove __memblock_x86_find_in_range_size()

2010-10-05 21:45:43 -07:00

memtest.c

x86, memblock: Replace e820_/_early string with memblock_

2010-08-27 11:13:47 -07:00

mmap.c

x86: Use helpers for rlimits

2010-01-27 15:17:31 -08:00

mmio-mod.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

numa_32.c

x86-32, memblock: Make add_highpages honor early reserved ranges

2010-10-05 21:44:35 -07:00

numa_64.c

x86, amd-nb: Complete the rename of AMD NB and related code

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

numa.c

x86/mm: Remove unused DBG() macro

2010-05-31 10:01:53 +02:00

pageattr-test.c

x86: make sure the CPA test code's use of _PAGE_UNUSED1 is obvious

2008-09-05 17:09:57 +02:00

pageattr.c

x86: Add NX protection for kernel data

2010-11-18 12:52:04 +01:00

pat_internal.h

x86, pat: Fix memory leak in free_memtype

2010-05-26 11:26:04 -07:00

pat_rbtree.c

rbtree: Undo augmented trees performance damage and regression

2010-07-05 14:43:50 +02:00

pat.c

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

2010-08-06 10:17:52 -07:00

pf_in.c

x86,mmiotrace: Add support for tracing STOS instruction

2010-08-02 01:32:01 +02:00

pf_in.h

x86 mmiotrace: move files into arch/x86/mm/.

2008-05-24 11:25:37 +02:00

pgtable_32.c

x86: remove last traces of quicklist usage

2010-05-24 13:33:31 -07:00

pgtable.c

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

2010-10-21 13:53:24 -07:00

physaddr.c

x86: split __phys_addr out into separate file

2009-09-10 11:48:55 -07:00

physaddr.h

x86: split __phys_addr out into separate file

2009-09-10 11:48:55 -07:00

setup_nx.c

x86, cpu: Only CPU features determine NX capabilities

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

srat_32.c

x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation

2010-12-23 13:16:18 -08:00

srat_64.c

x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation

2010-12-23 13:16:18 -08:00

testmmiotrace.c

x86, kmmio/mmiotrace: Fix double free of kmmio_fault_pages

2010-06-18 11:30:09 +02:00

tlb.c

x86: Use online node real index in calulate_tbl_offset()

2010-11-18 10:10:50 +01:00