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

Commit 474a83b7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' 



Merge in the relevant upstream merge point to queue up dependent patch.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 16c21ae5 654fdd04

CREDITS

+1 −2
Original line number Diff line number Diff line
@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario 
S: Canada K2P 0X8



N: Mikael Pettersson

E: mikpe@it.uu.se

W: http://user.it.uu.se/~mikpe/linux/

E: mikpelinux@gmail.com

D: Miscellaneous fixes



N: Reed H. Petty

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6596,7 +6596,7 @@ S: Obsolete 
F:	drivers/net/wireless/prism54/



PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER

M:	Mikael Pettersson <mikpe@it.uu.se>

M:	Mikael Pettersson <mikpelinux@gmail.com>

L:	linux-ide@vger.kernel.org

S:	Maintained

F:	drivers/ata/sata_promise.*

arch/x86/kernel/cpu/perf_event.c

+5 −5
Original line number Diff line number Diff line
@@ -1883,9 +1883,9 @@ static struct pmu pmu = { 


void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)

{

	userpg->cap_usr_time = 0;

	userpg->cap_usr_time_zero = 0;

	userpg->cap_usr_rdpmc = x86_pmu.attr_rdpmc;

	userpg->cap_user_time = 0;

	userpg->cap_user_time_zero = 0;

	userpg->cap_user_rdpmc = x86_pmu.attr_rdpmc;

	userpg->pmc_width = x86_pmu.cntval_bits;



	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
@@ -1894,13 +1894,13 @@ void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) 
	if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))

		return;



	userpg->cap_usr_time = 1;

	userpg->cap_user_time = 1;

	userpg->time_mult = this_cpu_read(cyc2ns);

	userpg->time_shift = CYC2NS_SCALE_FACTOR;

	userpg->time_offset = this_cpu_read(cyc2ns_offset) - now;



	if (sched_clock_stable && !check_tsc_disabled()) {

		userpg->cap_usr_time_zero = 1;

		userpg->cap_user_time_zero = 1;

		userpg->time_zero = this_cpu_read(cyc2ns_offset);

	}

}

arch/x86/kernel/cpu/perf_event_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2325,6 +2325,7 @@ __init int intel_pmu_init(void) 
		break;



	case 55: /* Atom 22nm "Silvermont" */

	case 77: /* Avoton "Silvermont" */

		memcpy(hw_cache_event_ids, slm_hw_cache_event_ids,

			sizeof(hw_cache_event_ids));

		memcpy(hw_cache_extra_regs, slm_hw_cache_extra_regs,

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+5 −5
Original line number Diff line number Diff line
@@ -2706,14 +2706,14 @@ static void uncore_pmu_init_hrtimer(struct intel_uncore_box *box) 
	box->hrtimer.function = uncore_pmu_hrtimer;

}



struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cpu)

static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int node)

{

	struct intel_uncore_box *box;

	int i, size;



	size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);



	box = kzalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));

	box = kzalloc_node(size, GFP_KERNEL, node);

	if (!box)

		return NULL;
@@ -3031,7 +3031,7 @@ static int uncore_validate_group(struct intel_uncore_pmu *pmu, 
	struct intel_uncore_box *fake_box;

	int ret = -EINVAL, n;



	fake_box = uncore_alloc_box(pmu->type, smp_processor_id());

	fake_box = uncore_alloc_box(pmu->type, NUMA_NO_NODE);

	if (!fake_box)

		return -ENOMEM;
@@ -3294,7 +3294,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id 
	}



	type = pci_uncores[UNCORE_PCI_DEV_TYPE(id->driver_data)];

	box = uncore_alloc_box(type, 0);

	box = uncore_alloc_box(type, NUMA_NO_NODE);

	if (!box)

		return -ENOMEM;
@@ -3499,7 +3499,7 @@ static int uncore_cpu_prepare(int cpu, int phys_id) 
			if (pmu->func_id < 0)

				pmu->func_id = j;



			box = uncore_alloc_box(type, cpu);

			box = uncore_alloc_box(type, cpu_to_node(cpu));

			if (!box)

				return -ENOMEM;