Skip to content

Commit 0e494be

Browse files
committed
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"
2 parents 9608c7b + 3c70de9 commit 0e494be

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/firewire/core-device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
12111211
* without actually having a link.
12121212
*/
12131213
create:
1214-
device = kzalloc(sizeof(*device), GFP_KERNEL);
1214+
device = kzalloc(sizeof(*device), GFP_ATOMIC);
12151215
if (device == NULL)
12161216
break;
12171217

drivers/firewire/core-topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
101101
{
102102
struct fw_node *node;
103103

104-
node = kzalloc(struct_size(node, ports, port_count), GFP_KERNEL);
104+
node = kzalloc(struct_size(node, ports, port_count), GFP_ATOMIC);
105105
if (node == NULL)
106106
return NULL;
107107

0 commit comments

Comments
 (0)