Merge branch 'trace/ftrace/urgent' into HEAD

Browse source

Needed to merge trace/ftrace/urgent to get:

  Commit 59300b36f8 ("ftrace: Check if pages were allocated before calling free_pages()")

To clean up the code that is affected by it as well.

...

This commit is contained in:

Steven Rostedt (VMware) 2021-04-01 14:16:37 -04:00

parent 70193038a6 9deb193af6

commit 22d5755a85

2 changed files with 8 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

kernel/trace/ftrace.c

View file

3

kernel/trace/trace.c

View file