Ingo Molnar 6f56a8d024 Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict ...

Conflicts:
	arch/x86/kernel/i387.c

This commit is conflicting:

  e88221c50cad ("x86/fpu: Disable XSAVES* support for now")

These functions changed a lot, move the quirk to arch/x86/kernel/fpu/init.c's
fpu__init_system_xstate_size_legacy().

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

2015-05-20 12:01:01 +02:00

..

mcheck

x86/mce: Fix MCE severity messages

2015-05-18 10:31:22 +02:00

microcode

x86/microcode/amd: Drop the pci_ids.h dependency

2015-03-31 09:54:32 +02:00

mtrr

x86: mtrr: if: remove use of seq_printf return value

2015-04-15 16:35:24 -07:00

.gitignore

…

amd.c

x86_64, asm: Work around AMD SYSRET SS descriptor attribute issue

2015-04-26 17:57:38 -07:00

bugs_64.c

…

bugs.c

x86/fpu: Move various internal function prototypes to fpu/internal.h

2015-05-19 15:47:48 +02:00

centaur.c

x86: Remove CONFIG_X86_OOSTORE

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

common.c

x86/fpu/init: Move __setup() functions to fpu/init.c

2015-05-20 11:35:42 +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

hypervisor/x86/xen: Unset X86_BUG_SYSRET_SS_ATTRS on Xen PV guests

2015-05-05 18:27:43 +01:00

intel_cacheinfo.c

x86/cpu/cacheinfo: Fix cache_get_priv_group() for Intel processors

2015-03-23 10:22:38 +01:00

intel_pt.h

perf/x86/intel/pt: Add Intel PT PMU driver

2015-04-02 17:14:20 +02:00

intel.c

x86/cpu/intel: Fix trivial typo in intel_tlb_table[]

2015-02-22 08:55:58 +01:00

Makefile

perf/x86/intel/bts: Add BTS PMU driver

2015-04-02 17:14:21 +02:00

match.c

x86: align x86 arch with generic CPU modalias handling

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

mkcapflags.sh

x86/build: Fix mkcapflags.sh bash-ism

2015-02-19 02:21:00 +01:00

mshyperv.c

x86, hyperv: Mark the Hyper-V clocksource as being continuous

2015-01-20 14:36:25 +01:00

perf_event_amd_ibs.c

perf/x86/amd/ibs: Convert force_ibs_eilvt_setup() to void

2015-02-18 17:01:46 +01:00

perf_event_amd_iommu.c

cpumask: factor out show_cpumap into separate helper function

2014-11-07 11:45:00 -08:00

perf_event_amd_iommu.h

perf/x86/amd: AMD IOMMU Performance Counter PERF uncore PMU implementation

2013-06-19 13:04:53 +02:00

perf_event_amd_uncore.c

cpumask: factor out show_cpumap into separate helper function

2014-11-07 11:45:00 -08:00

perf_event_amd.c

perf/x86: Add 'index' param to get_event_constraint() callback

2015-04-02 17:33:10 +02:00

perf_event_intel_bts.c

perf/x86/intel/pt: Fix the 32-bit build

2015-04-02 17:58:45 +02:00

perf_event_intel_cqm.c

perf: Remove type specific target pointers

2015-03-23 10:58:04 +01:00

perf_event_intel_ds.c

perf/x86/intel: Fix Core2,Atom,NHM,WSM cycles:pp events

2015-04-17 09:58:47 +02:00

perf_event_intel_lbr.c

perf/x86/intel: Avoid rewriting DEBUGCTL with the same value for LBRs

2015-04-02 17:33:20 +02:00

perf_event_intel_pt.c

perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()

2015-04-18 13:31:26 +02:00

perf_event_intel_rapl.c

perf/x86/rapl: Enable Broadwell-U RAPL support

2015-05-11 11:52:30 +02:00

perf_event_intel_uncore_nhmex.c

perf/x86/uncore: Fix coccinelle warnings

2014-08-13 07:51:09 +02:00

perf_event_intel_uncore_snb.c

perf/x86/intel/uncore: Move PCI IDs for IMC to uncore driver

2015-04-22 08:29:19 +02:00

perf_event_intel_uncore_snbep.c

perf/x86/intel/uncore: Delete an unnecessary check before pci_dev_put() call

2015-02-18 17:01:42 +01:00

perf_event_intel_uncore.c

perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization

2015-01-28 13:04:34 +01:00

perf_event_intel_uncore.h

perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization

2015-01-28 13:04:34 +01:00

perf_event_intel.c

perf/x86/intel: Fix SLM cache event list

2015-05-08 11:59:41 +02:00

perf_event_knc.c

x86: Replace __get_cpu_var uses

2014-08-26 13:45:49 -04:00

perf_event_p4.c

x86: Replace __get_cpu_var uses

2014-08-26 13:45:49 -04: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

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

2015-04-14 14:37:47 -07:00

perf_event.h

perf/x86: Fix hw_perf_event::flags collision

2015-04-17 09:50:43 +02:00

perfctr-watchdog.c

perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU

2012-10-04 13:32:37 +02:00

powerflags.c

update AMD powerflags comments

2013-05-28 12:02:10 +02:00

proc.c

x86: Replace seq_printf() with seq_puts()

2014-12-08 11:48:15 +01:00

rdrand.c

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

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

scattered.c

x86: Add Intel Processor Trace (INTEL_PT) cpu feature detection

2015-04-02 17:14:18 +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