shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 71446b65c0 ("scsi: pm8001: Do not overwrite PCI queue mapping") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.113

Resolves merge conflicts in:
	kernel/jump_label.c

Change-Id: Ibd4d6563350488956bd310e499467554ce495341
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-11-10 09:24:16 +00:00
parent fbffc4367f 71446b65c0
commit bf14675822
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/pm8001/pm8001_init.c
View File

@@ -87,10 +87,12 @@ static void pm8001_map_queues(struct Scsi_Host *shost)
struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; struct pm8001_hba_info *pm8001_ha = sha->lldd_ha;
struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT]; struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT];
if (pm8001_ha->number_of_intr > 1) if (pm8001_ha->number_of_intr > 1) {
blk_mq_pci_map_queues(qmap, pm8001_ha->pdev, 1); blk_mq_pci_map_queues(qmap, pm8001_ha->pdev, 1);
return;
}
return blk_mq_map_queues(qmap); blk_mq_map_queues(qmap);
} }
/* /*

13
kernel/static_call_inline.c
View File

@@ -400,6 +400,17 @@ static void static_call_del_module(struct module *mod)
for (site = start; site < stop; site++) { for (site = start; site < stop; site++) {
key = static_call_key(site); key = static_call_key(site);
/*
* If the key was not updated due to a memory allocation
* failure in __static_call_init() then treating key::sites
* as key::mods in the code below would cause random memory
* access and #GP. In that case all subsequent sites have
* not been touched either, so stop iterating.
*/
if (!static_call_key_has_mods(key))
break;
if (key == prev_key) if (key == prev_key)
continue; continue;
@@ -431,7 +442,7 @@ static int static_call_module_notify(struct notifier_block *nb,
case MODULE_STATE_COMING: case MODULE_STATE_COMING:
ret = static_call_add_module(mod); ret = static_call_add_module(mod);
if (ret) { if (ret) {
WARN(1, "Failed to allocate memory for static calls"); pr_warn("Failed to allocate memory for static calls\n");
static_call_del_module(mod); static_call_del_module(mod);
} }
break; break;