Ingo Molnar e0cb4ebcd9 Merge branch 'tracing/urgent' into tracing/ftrace ...

Conflicts:
	kernel/trace/trace.c

2008-11-11 09:40:18 +01:00

..

dump_pagetables.c

x86: another user of PTE_FLAGS_MASK

2008-08-20 12:38:41 +02:00

extable.c

x86: unify extable_{32|64}.c

2008-01-30 13:31:41 +01:00

fault.c

trace: add the MMIO-tracer to the tracer menu, cleanup

2008-10-27 14:07:26 +01:00

gup.c

x86: two trivial sparse annotations

2008-10-29 08:02:28 +01:00

highmem_32.c

Export kmap_atomic_pfn for DRM-GEM.

2008-10-18 07:10:12 +10:00

hugetlbpage.c

x86: add hugepagesz option on 64-bit

2008-07-24 10:47:19 -07:00

init_32.c

x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps

2008-10-31 10:12:38 +01:00

init_64.c

x86: remove debug code from arch_add_memory()

2008-10-29 09:29:22 +01:00

iomap_32.c

x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps

2008-10-31 10:12:38 +01:00

ioremap.c

x86: start annotating early ioremap pointers with __iomem

2008-10-29 08:05:14 +01:00

k8topology_64.c

x86: remove end_pfn in 64bit

2008-07-08 13:10:38 +02:00

kmmio.c

- fix mmioftrace + rcu merge interaction

2008-05-25 09:51:43 +02:00

Makefile

Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 'tracing/urgent' into tracing/core

2008-11-08 09:34:35 +01:00

memtest.c

x86: memtest fix use of reserve_early()

2008-10-22 17:08:06 +02:00

mmap.c

x86: unify mmap_{32|64}.c

2008-01-30 13:31:10 +01:00

mmio-mod.c

mmiotrace: remove left-over marker cruft

2008-10-14 10:37:17 +02:00

numa_32.c

x86: rename discontig_32.c to numa_32.c

2008-10-13 10:19:59 +02:00

numa_64.c

x86: convert numa_64.c from round_up to roundup

2008-07-26 15:39:21 +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: align DirectMap in /proc/meminfo

2008-11-06 15:27:37 +01:00

pat.c

x86: fix /dev/mem mmap breakage when PAT is disabled

2008-10-30 23:54:41 +01:00

pf_in.c

x86: fix mmiotrace 8-bit register decoding

2008-10-14 10:33:50 +02:00

pf_in.h

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

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

pgtable_32.c

i386: vmalloc size fix

2008-08-21 10:13:21 +02:00

pgtable.c

x86: pgd_{c,d}tor() cleanup

2008-09-06 19:47:09 +02:00

srat_32.c

x86: don't call e820_regiter_active_regions if out of range on node

2008-08-14 11:35:52 +02:00

srat_64.c

x86, uv: add early detection of UV system types

2008-10-13 10:21:51 +02:00

testmmiotrace.c

x86 mmiotrace: implement mmiotrace_printk()

2008-10-14 10:37:11 +02:00