diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-21 22:16:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-21 22:16:08 +0100 |
| commit | ca8778c45e401067cefe2abbfb8b547c30d45908 (patch) | |
| tree | c10beaf40adb2bbc6a8933f87ff9da7a5366bf42 /drivers/scsi/mpt3sas/mpt3sas_scsih.c | |
| parent | 21d6a7dcbfba5e7b31f4e9d555a9be362578bfc3 (diff) | |
| parent | 2c41fab1c60b02626c8153a1806a7a1e5d62aaf1 (diff) | |
Merge branch 'linus' into x86/cleanups, to resolve conflict
Conflicts:
arch/x86/kernel/kprobes/ftrace.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_scsih.c')
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index ffca03064797..6aa6de729187 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -413,7 +413,7 @@ mpt3sas_get_port_by_id(struct MPT3SAS_ADAPTER *ioc, * And add this object to port_table_list. */ if (!ioc->multipath_on_hba) { - port = kzalloc(sizeof(struct hba_port), GFP_KERNEL); + port = kzalloc(sizeof(struct hba_port), GFP_ATOMIC); if (!port) return NULL; |