Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec3b93ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Ingo Molnar:
 "Misc fixes and minor updates all over the place:

   - an SGI/UV fix
   - a defconfig update
   - a build warning fix
   - move the boot_params file to the arch location in debugfs
   - a pkeys fix
   - selftests fix
   - boot message fixes
   - sparse fixes
   - a resume warning fix
   - ioapic hotplug fixes
   - reboot quirks

  ... plus various minor cleanups"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build/x86_64_defconfig: Enable CONFIG_R8169
  x86/reboot/quirks: Add ASUS EeeBook X205TA/W reboot quirk
  x86/hpet: Prevent might sleep splat on resume
  x86/boot: Correct setup_header.start_sys name
  x86/purgatory: Fix sparse warning, symbol not declared
  x86/purgatory: Make functions and variables static
  x86/events: Remove last remnants of old filenames
  x86/pkeys: Check against max pkey to avoid overflows
  x86/ioapic: Split IOAPIC hot-removal into two steps
  x86/PCI: Implement pcibios_release_device to release IRQ from IOAPIC
  x86/intel_rdt: Remove duplicate inclusion of linux/cpu.h
  x86/vmware: Remove duplicate inclusion of asm/timer.h
  x86/hyperv: Hide unused label
  x86/reboot/quirks: Add ASUS EeeBook X205TA reboot quirk
  x86/platform/uv/BAU: Fix HUB errors by remove initial write to sw-ack register
  x86/selftests: Add clobbers for int80 on x86_64
  x86/apic: Simplify enable_IR_x2apic(), remove try_to_enable_IR()
  x86/apic: Fix a warning message in logical CPU IDs allocation
  x86/kdebugfs: Move boot params hierarchy under (debugfs)/x86/
parents 8a917235 f2853308

arch/x86/configs/x86_64_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ CONFIG_E1000E=y 
CONFIG_SKY2=y

CONFIG_FORCEDETH=y

CONFIG_8139TOO=y

CONFIG_R8169=y

CONFIG_FDDI=y

CONFIG_INPUT_POLLDEV=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

arch/x86/events/amd/core.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, int idx, 
			return &amd_f15_PMC20;

		}

	case AMD_EVENT_NB:

		/* moved to perf_event_amd_uncore.c */

		/* moved to uncore.c */

		return &emptyconstraint;

	default:

		return &emptyconstraint;

arch/x86/events/intel/cstate.c

+1 −1
Original line number Diff line number Diff line 
/*

 * perf_event_intel_cstate.c: support cstate residency counters

 * Support cstate residency counters

 *

 * Copyright (C) 2015, Intel Corp.

 * Author: Kan Liang (kan.liang@intel.com)

arch/x86/events/intel/rapl.c

+1 −1
Original line number Diff line number Diff line 
/*

 * perf_event_intel_rapl.c: support Intel RAPL energy consumption counters

 * Support Intel RAPL energy consumption counters

 * Copyright (C) 2013 Google, Inc., Stephane Eranian

 *

 * Intel RAPL interface is specified in the IA-32 Manual Vol3b

arch/x86/events/intel/uncore.h

+3 −3
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ extern struct list_head pci2phy_map_head; 
extern struct pci_extra_dev *uncore_extra_pci_dev;

extern struct event_constraint uncore_constraint_empty;



/* perf_event_intel_uncore_snb.c */

/* uncore_snb.c */

int snb_uncore_pci_init(void);

int ivb_uncore_pci_init(void);

int hsw_uncore_pci_init(void);
@@ -371,7 +371,7 @@ void nhm_uncore_cpu_init(void); 
void skl_uncore_cpu_init(void);

int snb_pci2phy_map_init(int devid);



/* perf_event_intel_uncore_snbep.c */

/* uncore_snbep.c */

int snbep_uncore_pci_init(void);

void snbep_uncore_cpu_init(void);

int ivbep_uncore_pci_init(void);
@@ -385,5 +385,5 @@ void knl_uncore_cpu_init(void); 
int skx_uncore_pci_init(void);

void skx_uncore_cpu_init(void);



/* perf_event_intel_uncore_nhmex.c */

/* uncore_nhmex.c */

void nhmex_uncore_cpu_init(void);