Merge 5623870d9b ("Merge tag 'irq-msi-2025-07-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline
Steps on the way to v6.17-rc1 Change-Id: I9b9682ce6bcd301941502f0ae54d1300a5af16fe Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
commit
a3ea2159ad
346 files changed
+6183
-2396
No files matched your search
@@ -56,9 +56,9 @@ static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
|
||||
{
|
||||
const struct bin_attribute *const *bin_attr;
|
||||
|
||||
for (bin_attr = sect_attrs->grp.bin_attrs_new; *bin_attr; bin_attr++)
|
||||
for (bin_attr = sect_attrs->grp.bin_attrs; *bin_attr; bin_attr++)
|
||||
kfree((*bin_attr)->attr.name);
|
||||
kfree(sect_attrs->grp.bin_attrs_new);
|
||||
kfree(sect_attrs->grp.bin_attrs);
|
||||
kfree(sect_attrs);
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info)
|
||||
|
||||
/* Setup section attributes. */
|
||||
sect_attrs->grp.name = "sections";
|
||||
sect_attrs->grp.bin_attrs_new = gattr;
|
||||
sect_attrs->grp.bin_attrs = gattr;
|
||||
|
||||
sattr = §_attrs->attrs[0];
|
||||
for (i = 0; i < info->hdr->e_shnum; i++) {
|
||||
@@ -101,7 +101,7 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info)
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
sattr->read_new = module_sect_read;
|
||||
sattr->read = module_sect_read;
|
||||
sattr->private = (void *)sec->sh_addr;
|
||||
sattr->size = MODULE_SECT_READ_SIZE;
|
||||
sattr->attr.mode = 0400;
|
||||
@@ -144,7 +144,7 @@ struct module_notes_attrs {
|
||||
|
||||
static void free_notes_attrs(struct module_notes_attrs *notes_attrs)
|
||||
{
|
||||
kfree(notes_attrs->grp.bin_attrs_new);
|
||||
kfree(notes_attrs->grp.bin_attrs);
|
||||
kfree(notes_attrs);
|
||||
}
|
||||
|
||||
@@ -178,7 +178,7 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info)
|
||||
}
|
||||
|
||||
notes_attrs->grp.name = "notes";
|
||||
notes_attrs->grp.bin_attrs_new = gattr;
|
||||
notes_attrs->grp.bin_attrs = gattr;
|
||||
|
||||
nattr = ¬es_attrs->attrs[0];
|
||||
for (loaded = i = 0; i < info->hdr->e_shnum; ++i) {
|
||||
@@ -190,7 +190,7 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info)
|
||||
nattr->attr.mode = 0444;
|
||||
nattr->size = info->sechdrs[i].sh_size;
|
||||
nattr->private = (void *)info->sechdrs[i].sh_addr;
|
||||
nattr->read_new = sysfs_bin_attr_simple_read;
|
||||
nattr->read = sysfs_bin_attr_simple_read;
|
||||
*(gattr++) = nattr++;
|
||||
}
|
||||
++loaded;
|
||||
|
||||
Reference in new issue
Block a user