Ingo Molnar ec00010972 Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches ...

Conflicts:
	arch/x86/kernel/traps.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2014-06-06 07:55:06 +02:00

..

mcheck

asmlinkage, x86: Add explicit __visible to arch/x86/*

2014-05-05 16:07:44 -07:00

microcode

* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

2014-02-07 11:27:30 -08:00

mtrr

mm, x86: Account for TLB flushes only when debugging

2014-01-25 09:10:41 +01:00

.gitignore

…

amd.c

Rename TAINT_UNSAFE_SMP to TAINT_CPU_OUT_OF_SPEC

2014-03-20 16:28:09 -07:00

bugs_64.c

…

bugs.c

…

centaur.c

x86: Remove CONFIG_X86_OOSTORE

2014-03-11 10:16:18 -07:00

common.c

kprobes, x86: Prohibit probing on debug_stack_*()

2014-04-24 10:02:57 +02:00

cpu.h

x86/cpu: Track legacy CPU model data only on 32-bit kernels

2013-10-26 13:34:39 +02:00

cyrix.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

hypervisor.c

x86: Correctly detect hypervisor

2013-08-05 06:35:33 -07:00

intel_cacheinfo.c

x86, intel, cacheinfo: Fix CPU hotplug callback registration

2014-03-20 13:43:43 +01:00

intel.c

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

2014-04-02 13:15:58 -07:00

Makefile

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

2014-01-20 12:07:54 -08:00

match.c

x86: align x86 arch with generic CPU modalias handling

2014-02-18 12:45:38 -08:00

mkcapflags.sh

…

mshyperv.c

Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-04-01 11:22:57 -07:00

perf_event_amd_ibs.c

kprobes, x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation

2014-04-24 10:26:38 +02:00

perf_event_amd_iommu.c

perf/x86/amd: Do not print an error when the device is not present

2013-07-05 08:27:15 +02:00

perf_event_amd_iommu.h

…

perf_event_amd_uncore.c

x86, amd, uncore: Fix CPU hotplug callback registration

2014-03-20 13:43:43 +01:00

perf_event_amd.c

perf: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node()

2013-09-02 08:42:49 +02:00

perf_event_intel_ds.c

fix Haswell precise store data source encoding

2014-05-19 21:52:59 +09:00

perf_event_intel_lbr.c

perf/x86: Add conditional branch filtering support

2014-06-05 12:30:23 +02:00

perf_event_intel_rapl.c

perf/x86: Fix RAPL rdmsrl_safe() usage

2014-04-24 08:12:41 +02:00

perf_event_intel_uncore.c

CPU hotplug notifiers registration fixes for 3.15-rc1

2014-04-07 14:55:46 -07:00

perf_event_intel_uncore.h

perf/x86/uncore: add hrtimer to SNB uncore IMC PMU

2014-02-21 21:49:08 +01:00

perf_event_intel.c

perf/x86/intel: Fix Silvermont's event constraints

2014-05-07 11:33:16 +02:00

perf_event_knc.c

…

perf_event_p4.c

perf/x86/p4: Block PMIs on init to prevent a stream of unkown NMIs

2014-02-09 13:20:35 +01:00

perf_event_p6.c

perf/x86/intel/p6: Add userspace RDPMC quirk for PPro

2014-02-09 13:08:24 +01:00

perf_event.c

perf/x86: Use common PMU interrupt disabled code

2014-06-05 12:30:03 +02:00

perf_event.h

perf/x86: Add a few more comments

2014-02-27 12:43:25 +01:00

perfctr-watchdog.c

…

powerflags.c

…

proc.c

x86/cpu: Always print SMP information in /proc/cpuinfo

2013-11-06 08:13:56 +01:00

rdrand.c

x86, rdrand: When nordrand is specified, disable RDSEED as well

2014-05-11 20:25:20 -07:00

scattered.c

treewide: Fix common typo in "identify"

2013-10-14 15:31:06 +02:00

topology.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

transmeta.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

umc.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

vmware.c

x86: Correctly detect hypervisor

2013-08-05 06:35:33 -07:00