renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-05 20:24:09 +08:00
Code
8f8ffe2485
linux-next/arch/x86
History
Frederic Weisbecker 8f8ffe2485 Merge commit 'tracing/core' into tracing/kprobes 
Conflicts:
	kernel/trace/trace_export.c
	kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

	0dd7b74787:
	tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
2009-09-11 01:09:23 +02:00
..
boot x86: add vmlinux.lds to targets in arch/x86/boot/compressed/Makefile 2009-08-20 16:08:58 -07:00
configs tracing: Rename FTRACE_SYSCALLS for tracepoints 2009-08-26 00:17:35 +02:00
crypto crypto: aes-ni - Remove CRYPTO_TFM_REQ_MAY_SLEEP from fpu template 2009-06-18 19:44:01 +08:00
ia32 Merge branch 'core/signal' into perfcounters/core 2009-04-30 21:16:49 +02:00
include/asm Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
kernel Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
kvm KVM: MMU: limit rmap chain length 2009-08-06 12:06:54 +03:00
lguest lguest: update commentry 2009-07-30 16:03:46 +09:30
lib x86: Instruction decoder API 2009-08-27 00:35:56 +02:00
math-emu Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
mm Merge commit 'tracing/core' into tracing/kprobes 2009-09-11 01:09:23 +02:00
oprofile x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon 2009-07-10 05:22:50 +02:00
pci x86/pci: insert ioapic resource before assigning unassigned resources 2009-07-10 13:03:14 -07:00
power x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR 2009-07-08 13:20:13 +02:00
tools x86: Remove unused config macros from instruction decoder selftest 2009-09-04 18:14:15 +02:00
vdso gcov: enable GCOV_PROFILE_ALL for x86_64 2009-06-18 13:03:58 -07:00
video
xen x86, xen: Initialize cx to suppress warning 2009-08-25 21:10:32 -07:00
Kbuild x86: standardize Kbuild rules 2009-04-16 18:09:02 +02:00
Kconfig Merge commit 'v2.6.31-rc9' into tracing/core 2009-09-06 06:11:42 +02:00
Kconfig.cpu Revert "x86, bts: reenable ptrace branch trace support" 2009-06-11 00:32:00 +02:00
Kconfig.debug x86: X86 instruction decoder build-time selftest 2009-08-27 00:35:56 +02:00
Makefile x86: X86 instruction decoder build-time selftest 2009-08-27 00:35:56 +02:00
Makefile_32.cpu