Linus Torvalds 92b29b86fe Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ...

* 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits)
  tracing/fastboot: improve help text
  tracing/stacktrace: improve help text
  tracing/fastboot: fix initcalls disposition in bootgraph.pl
  tracing/fastboot: fix bootgraph.pl initcall name regexp
  tracing/fastboot: fix issues and improve output of bootgraph.pl
  tracepoints: synchronize unregister static inline
  tracepoints: tracepoint_synchronize_unregister()
  ftrace: make ftrace_test_p6nop disassembler-friendly
  markers: fix synchronize marker unregister static inline
  tracing/fastboot: add better resolution to initcall debug/tracing
  trace: add build-time check to avoid overrunning hex buffer
  ftrace: fix hex output mode of ftrace
  tracing/fastboot: fix initcalls disposition in bootgraph.pl
  tracing/fastboot: fix printk format typo in boot tracer
  ftrace: return an error when setting a nonexistent tracer
  ftrace: make some tracers reentrant
  ring-buffer: make reentrant
  ring-buffer: move page indexes into page headers
  tracing/fastboot: only trace non-module initcalls
  ftrace: move pc counter in irqtrace
  ...

Manually fix conflicts:
 - init/main.c: initcall tracing
 - kernel/module.c: verbose level vs tracepoints
 - scripts/bootgraph.pl: fallout from cherry-picking commits.

2008-10-20 13:35:07 -07:00

..

dump_pagetables.c

x86: another user of PTE_FLAGS_MASK

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

extable.c

…

fault.c

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

2008-10-16 15:08:45 -07:00

gup.c

x86: make mm/gup.c more virtualization friendly

2008-10-13 10:21:18 +02: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 _PAGE_IOMAP pte flag for IO mappings

2008-10-13 10:20:56 +02:00

init_64.c

x86-64: fix combining of regions in init_memory_mapping()

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

ioremap.c

Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/printk' and 'core/misc' into core-v28-for-linus

2008-10-15 12:48:44 +02:00

k8topology_64.c

x86: remove end_pfn in 64bit

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

kmmio.c

…

Makefile

x86: rename discontig_32.c to numa_32.c

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

memtest.c

x86: seperate memtest from init_64.c

2008-07-18 14:10:27 +02:00

mmap.c

…

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

mm: rewrite vmap layer

2008-10-20 08:52:32 -07:00

pat.c

x86, pat: cleanups

2008-10-10 19:29:20 +02:00

pf_in.c

x86: fix mmiotrace 8-bit register decoding

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

pf_in.h

…

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