linux_dsm_epyc7002/arch/ia64/include/asm
Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
  tracing, net: fix net tree and tracing tree merge interaction
  tracing, powerpc: fix powerpc tree and tracing tree interaction
  ring-buffer: do not remove reader page from list on ring buffer free
  function-graph: allow unregistering twice
  trace: make argument 'mem' of trace_seq_putmem() const
  tracing: add missing 'extern' keywords to trace_output.h
  tracing: provide trace_seq_reserve()
  blktrace: print out BLK_TN_MESSAGE properly
  blktrace: extract duplidate code
  blktrace: fix memory leak when freeing struct blk_io_trace
  blktrace: fix blk_probes_ref chaos
  blktrace: make classic output more classic
  blktrace: fix off-by-one bug
  blktrace: fix the original blktrace
  blktrace: fix a race when creating blk_tree_root in debugfs
  blktrace: fix timestamp in binary output
  tracing, Text Edit Lock: cleanup
  tracing: filter fix for TRACE_EVENT_FORMAT events
  ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
  x86: kretprobe-booster interrupt emulation code fix
  ...

Fix up trivial conflicts in
 arch/parisc/include/asm/ftrace.h
 include/linux/memory.h
 kernel/extable.c
 kernel/module.c
2009-04-05 11:04:19 -07:00
..
native
sn
uv sgi-gru: add macros for using the UV hub to send interrupts 2009-04-02 19:05:05 -07:00
xen
acpi-ext.h
acpi.h
agp.h
asmmacro.h
atomic.h
auxvec.h
bitops.h
break.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
checksum.h
compat.h
cpu.h
cputime.h
current.h
cyclone.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h
dmi.h
elf.h
emergency-restart.h
errno.h
esi.h
fb.h
fcntl.h
fpswa.h
fpu.h
ftrace.h
futex.h
gcc_intrin.h
hardirq.h
hpsim.h
hugetlb.h
hw_irq.h
ia32.h
ia64regs.h
intel_intrin.h
intrinsics.h
io.h
ioctl.h
ioctls.h
iommu.h
iosapic.h
ipcbuf.h
irq_regs.h
irq.h
Kbuild
kdebug.h
kexec.h
kmap_types.h
kprobes.h
kregs.h
kvm_host.h
kvm_para.h
kvm.h
libata-portmap.h
linkage.h
local.h
machvec_dig_vtd.h
machvec_dig.h
machvec_hpsim.h
machvec_hpzx1_swiotlb.h
machvec_hpzx1.h
machvec_init.h
machvec_sn2.h
machvec_uv.h
machvec_xen.h
machvec.h
mc146818rtc.h
mca_asm.h
mca.h
meminit.h
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h
msgbuf.h
msidef.h
mutex.h
nodedata.h
numa.h
page.h
pal.h
param.h
paravirt_patch.h
paravirt_privop.h
paravirt.h
parport.h
patch.h
pci.h
percpu.h
perfmon_default_smpl.h
perfmon.h
pgalloc.h
pgtable.h
poll.h
posix_types.h
processor.h
ptrace_offsets.h
ptrace.h
pvclock-abi.h
resource.h
rse.h
rwsem.h
sal.h
scatterlist.h
sections.h
segment.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h ia64: implement interrupt-enabling rwlocks 2009-04-02 19:05:11 -07:00
stat.h
statfs.h
string.h
suspend.h
swab.h
swiotlb.h
sync_bitops.h
syscall.h
system.h
termbits.h
termios.h
thread_info.h
timex.h
tlb.h
tlbflush.h
topology.h
types.h
uaccess.h
ucontext.h
unaligned.h
uncached.h
unistd.h
unwind.h
user.h
ustack.h
vga.h
xor.h