mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-25 11:55:37 +00:00
firewire fixes for 6.6-rc2
A change applied to v6.5 kernel brings an issue that usual GFP allocation is done in atomic context under acquired spin-lock. Let us revert it. -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQE66IEYNDXNBPeGKSsLtaWM8LwEwUCZQQq3QAKCRCsLtaWM8Lw ExNAAP9q3ke8sQnVB0/xp2ggfPEmf/krJ685EcDTLX412MR9oAEA7WqFrbZVJrVm +/eL4H38iFH1utrfG/zFj7LAonPVdAQ= =+maU -----END PGP SIGNATURE----- Merge tag 'firewire-fixes-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 Pull firewire fix from Takashi Sakamoto: "A change applied to v6.5 kernel brings an issue that usual GFP allocation is done in atomic context under acquired spin-lock. Let us revert it" * tag 'firewire-fixes-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: Revert "firewire: core: obsolete usage of GFP_ATOMIC at building node tree"
This commit is contained in:
commit
0e494be7c5
2 changed files with 2 additions and 2 deletions
|
@ -1211,7 +1211,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
|
|||
* without actually having a link.
|
||||
*/
|
||||
create:
|
||||
device = kzalloc(sizeof(*device), GFP_KERNEL);
|
||||
device = kzalloc(sizeof(*device), GFP_ATOMIC);
|
||||
if (device == NULL)
|
||||
break;
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
|
|||
{
|
||||
struct fw_node *node;
|
||||
|
||||
node = kzalloc(struct_size(node, ports, port_count), GFP_KERNEL);
|
||||
node = kzalloc(struct_size(node, ports, port_count), GFP_ATOMIC);
|
||||
if (node == NULL)
|
||||
return NULL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue