diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2023-09-15 13:51:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2023-09-15 13:51:01 -0700 |
| commit | 0e494be7c557829344fd5a89d038864efd888c43 (patch) | |
| tree | 28e703ff6c6c436389730f513754adf4a58f3208 | |
| parent | Merge tag 'drm-fixes-2023-09-15' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | Revert "firewire: core: obsolete usage of GFP_ATOMIC at building node tree" (diff) | |
| download | linux-0e494be7c557829344fd5a89d038864efd888c43.tar.gz linux-0e494be7c557829344fd5a89d038864efd888c43.tar.bz2 linux-0e494be7c557829344fd5a89d038864efd888c43.zip | |
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"
| -rw-r--r-- | drivers/firewire/core-device.c | 2 | ||||
| -rw-r--r-- | drivers/firewire/core-topology.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index a3104e35412c..aa597cda0d88 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -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; diff --git a/drivers/firewire/core-topology.c b/drivers/firewire/core-topology.c index 88466b663482..f40c81534381 100644 --- a/drivers/firewire/core-topology.c +++ b/drivers/firewire/core-topology.c @@ -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; |