Commit 2273d5cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and... 

Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pulling latest branches from Ingo:

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  memblock: Fix size aligning of memblock_alloc_base_nid()

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf probe: Ensure offset provided is not greater than function length without DWARF info too
  perf tools: Ensure comm string is properly terminated
  perf probe: Ensure offset provided is not greater than function length
  perf evlist: Return first evsel for non-sample event on old kernel
  perf/hwbp: Fix a possible memory leak

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  CPU hotplug, cpusets, suspend: Don't touch cpusets during suspend/resume
parents 5189fa19 847854f5 5d85d97c 8f2f748b

kernel/events/hw_breakpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -651,10 +651,10 @@ int __init init_hw_breakpoint(void) 


 err_alloc:

	for_each_possible_cpu(err_cpu) {

		if (err_cpu == cpu)

			break;

		for (i = 0; i < TYPE_MAX; i++)

			kfree(per_cpu(nr_task_bp_pinned[i], cpu));

		if (err_cpu == cpu)

			break;

	}



	return -ENOMEM;

kernel/sched/core.c

+2 −2
Original line number Diff line number Diff line
@@ -6728,7 +6728,7 @@ int __init sched_create_sysfs_power_savings_entries(struct device *dev) 
static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,

			     void *hcpu)

{

	switch (action & ~CPU_TASKS_FROZEN) {

	switch (action) {

	case CPU_ONLINE:

	case CPU_DOWN_FAILED:

		cpuset_update_active_cpus();
@@ -6741,7 +6741,7 @@ static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action, 
static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action,

			       void *hcpu)

{

	switch (action & ~CPU_TASKS_FROZEN) {

	switch (action) {

	case CPU_DOWN_PREPARE:

		cpuset_update_active_cpus();

		return NOTIFY_OK;

mm/memblock.c

+3 −3
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start, 
	phys_addr_t this_start, this_end, cand;

	u64 i;



	/* align @size to avoid excessive fragmentation on reserved array */

	size = round_up(size, align);



	/* pump up @end */

	if (end == MEMBLOCK_ALLOC_ACCESSIBLE)

		end = memblock.current_limit;
@@ -731,6 +728,9 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size, 
{

	phys_addr_t found;



	/* align @size to avoid excessive fragmentation on reserved array */

	size = round_up(size, align);



	found = memblock_find_in_range_node(0, max_addr, size, align, nid);

	if (found && !memblock_reserve(found, size))

		return found;

tools/perf/util/event.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static pid_t perf_event__get_comm_tgid(pid_t pid, char *comm, size_t len) 
			if (size >= len)

				size = len - 1;

			memcpy(comm, name, size);

			comm[size] = '\0';



		} else if (memcmp(bf, "Tgid:", 5) == 0) {

			char *tgids = bf + 5;

tools/perf/util/evlist.c

+4 −0
Original line number Diff line number Diff line
@@ -349,6 +349,10 @@ struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id) 
	hlist_for_each_entry(sid, pos, head, node)

		if (sid->id == id)

			return sid->evsel;



	if (!perf_evlist__sample_id_all(evlist))

		return list_entry(evlist->entries.next, struct perf_evsel, node);



	return NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE