Merge 5.8-rc7 into driver-core-next
We want the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -87,8 +87,8 @@ parse_symbol() {
|
||||
return
|
||||
fi
|
||||
|
||||
# Strip out the base of the path
|
||||
code=${code#$basepath/}
|
||||
# Strip out the base of the path on each line
|
||||
code=$(while read -r line; do echo "${line#$basepath/}"; done <<< "$code")
|
||||
|
||||
# In the case of inlines, move everything to same line
|
||||
code=${code//$'\n'/' '}
|
||||
|
@@ -96,7 +96,7 @@ lx-symbols command."""
|
||||
return ""
|
||||
attrs = sect_attrs['attrs']
|
||||
section_name_to_address = {
|
||||
attrs[n]['name'].string(): attrs[n]['address']
|
||||
attrs[n]['battr']['attr']['name'].string(): attrs[n]['address']
|
||||
for n in range(int(sect_attrs['nsections']))}
|
||||
args = []
|
||||
for section_name in [".data", ".data..read_mostly", ".rodata", ".bss",
|
||||
|
@@ -138,11 +138,19 @@ char *read_text_file(const char *filename)
|
||||
|
||||
char *get_line(char **stringp)
|
||||
{
|
||||
char *orig = *stringp, *next;
|
||||
|
||||
/* do not return the unwanted extra line at EOF */
|
||||
if (*stringp && **stringp == '\0')
|
||||
if (!orig || *orig == '\0')
|
||||
return NULL;
|
||||
|
||||
return strsep(stringp, "\n");
|
||||
next = strchr(orig, '\n');
|
||||
if (next)
|
||||
*next++ = '\0';
|
||||
|
||||
*stringp = next;
|
||||
|
||||
return orig;
|
||||
}
|
||||
|
||||
/* A list of all modules we processed */
|
||||
|
Reference in New Issue
Block a user