UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge linux 6.6.56

This commit is contained in:
Jianping Liu 2024-10-11 21:27:37 +08:00
parent b03e997445 d4576c5670
commit da5787858f
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -8,9 +8,9 @@ else
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 6
SUBLEVEL = 55
SUBLEVEL = 56
EXTRAVERSION =
NAME = Hurr durr I'ma ninja sloth
NAME = Pinguïn Aangedreven
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"

17
tools/perf/util/machine.c
View File

@ -2536,12 +2536,8 @@ static void save_lbr_cursor_node(struct thread *thread,
cursor->curr = cursor->first;
else
cursor->curr = cursor->curr->next;
map_symbol__exit(&lbr_stitch->prev_lbr_cursor[idx].ms);
memcpy(&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,
sizeof(struct callchain_cursor_node));
lbr_stitch->prev_lbr_cursor[idx].ms.maps = maps__get(cursor->curr->ms.maps);
lbr_stitch->prev_lbr_cursor[idx].ms.map = map__get(cursor->curr->ms.map);
lbr_stitch->prev_lbr_cursor[idx].valid = true;
cursor->pos++;
@ -2752,9 +2748,6 @@ static bool has_stitched_lbr(struct thread *thread,
memcpy(&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],
sizeof(struct callchain_cursor_node));
stitch_node->cursor.ms.maps = maps__get(lbr_stitch->prev_lbr_cursor[i].ms.maps);
stitch_node->cursor.ms.map = map__get(lbr_stitch->prev_lbr_cursor[i].ms.map);
if (callee)
list_add(&stitch_node->node, &lbr_stitch->lists);
else
@ -2778,8 +2771,6 @@ static bool alloc_lbr_stitch(struct thread *thread, unsigned int max_lbr)
if (!thread__lbr_stitch(thread)->prev_lbr_cursor)
goto free_lbr_stitch;
thread__lbr_stitch(thread)->prev_lbr_cursor_size = max_lbr + 1;
INIT_LIST_HEAD(&thread__lbr_stitch(thread)->lists);
INIT_LIST_HEAD(&thread__lbr_stitch(thread)->free_lists);
@ -2835,12 +2826,8 @@ static int resolve_lbr_callchain_sample(struct thread *thread,
max_lbr, callee);
if (!stitched_lbr && !list_empty(&lbr_stitch->lists)) {
struct stitch_list *stitch_node;
list_for_each_entry(stitch_node, &lbr_stitch->lists, node)
map_symbol__exit(&stitch_node->cursor.ms);
list_splice_init(&lbr_stitch->lists, &lbr_stitch->free_lists);
list_replace_init(&lbr_stitch->lists,
&lbr_stitch->free_lists);
}
memcpy(&lbr_stitch->prev_sample, sample, sizeof(*sample));
}

4
tools/perf/util/thread.c
View File

@ -478,7 +478,6 @@ void thread__free_stitch_list(struct thread *thread)
return;
list_for_each_entry_safe(pos, tmp, &lbr_stitch->lists, node) {
map_symbol__exit(&pos->cursor.ms);
list_del_init(&pos->node);
free(pos);
}
@ -488,9 +487,6 @@ void thread__free_stitch_list(struct thread *thread)
free(pos);
}
for (unsigned int i = 0 ; i < lbr_stitch->prev_lbr_cursor_size; i++)
map_symbol__exit(&lbr_stitch->prev_lbr_cursor[i].ms);
zfree(&lbr_stitch->prev_lbr_cursor);
free(thread__lbr_stitch(thread));
thread__set_lbr_stitch(thread, NULL);

1
tools/perf/util/thread.h
View File

@ -28,7 +28,6 @@ struct lbr_stitch {
struct list_head free_lists;
struct perf_sample prev_sample;
struct callchain_cursor_node *prev_lbr_cursor;
unsigned int prev_lbr_cursor_size;
};
struct thread_rb_node {