From: Greg Kroah-Hartman Date: Wed, 4 Sep 2024 09:31:25 +0000 (+0200) Subject: drop fbdev patch that was causing build problems on some arches X-Git-Tag: v4.19.321~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=619801b4f14cb2ad0f01997eae4a01d5092c8e88;p=thirdparty%2Fkernel%2Fstable-queue.git drop fbdev patch that was causing build problems on some arches --- diff --git a/queue-4.19/fbdev-offb-replace-of_node_put-with-__free-device_no.patch b/queue-4.19/fbdev-offb-replace-of_node_put-with-__free-device_no.patch deleted file mode 100644 index ef8520a31a8..00000000000 --- a/queue-4.19/fbdev-offb-replace-of_node_put-with-__free-device_no.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bd7378b4c91f74c593c678515d52900f2e9a3fc6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 22 Apr 2024 21:20:21 -0400 -Subject: fbdev: offb: replace of_node_put with __free(device_node) - -From: Abdulrasaq Lawani - -[ Upstream commit ce4a7ae84a58b9f33aae8d6c769b3c94f3d5ce76 ] - -Replaced instance of of_node_put with __free(device_node) -to simplify code and protect against any memory leaks -due to future changes in the control flow. - -Suggested-by: Julia Lawall -Signed-off-by: Abdulrasaq Lawani -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - drivers/video/fbdev/offb.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c -index 77c0a2f45b3b9..b52c6080abe44 100644 ---- a/drivers/video/fbdev/offb.c -+++ b/drivers/video/fbdev/offb.c -@@ -352,7 +352,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - par->cmap_type = cmap_gxt2000; - } else if (dp && !strncmp(name, "vga,Display-", 12)) { - /* Look for AVIVO initialized by SLOF */ -- struct device_node *pciparent = of_get_parent(dp); -+ struct device_node *pciparent __free(device_node) = of_get_parent(dp); - const u32 *vid, *did; - vid = of_get_property(pciparent, "vendor-id", NULL); - did = of_get_property(pciparent, "device-id", NULL); -@@ -364,7 +364,6 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - if (par->cmap_adr) - par->cmap_type = cmap_avivo; - } -- of_node_put(pciparent); - } else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) { - #ifdef __BIG_ENDIAN - const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 }; --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 7e51bfcc132..45e51ccfdf5 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -44,7 +44,6 @@ nfs-avoid-infinite-loop-in-pnfs_update_layout.patch openrisc-call-setup_memory-earlier-in-the-init-seque.patch s390-iucv-fix-receive-buffer-virtual-vs-physical-add.patch usb-dwc3-core-skip-setting-event-buffers-for-host-on.patch -fbdev-offb-replace-of_node_put-with-__free-device_no.patch irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch ext4-set-the-type-of-max_zeroout-to-unsigned-int-to-.patch nvmet-rdma-fix-possible-bad-dereference-when-freeing.patch diff --git a/queue-5.10/fbdev-offb-replace-of_node_put-with-__free-device_no.patch b/queue-5.10/fbdev-offb-replace-of_node_put-with-__free-device_no.patch deleted file mode 100644 index bdd85fd7336..00000000000 --- a/queue-5.10/fbdev-offb-replace-of_node_put-with-__free-device_no.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2101a7272ee0ea39b7ee178ffc8026a4754b8637 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 22 Apr 2024 21:20:21 -0400 -Subject: fbdev: offb: replace of_node_put with __free(device_node) - -From: Abdulrasaq Lawani - -[ Upstream commit ce4a7ae84a58b9f33aae8d6c769b3c94f3d5ce76 ] - -Replaced instance of of_node_put with __free(device_node) -to simplify code and protect against any memory leaks -due to future changes in the control flow. - -Suggested-by: Julia Lawall -Signed-off-by: Abdulrasaq Lawani -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - drivers/video/fbdev/offb.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c -index 4501e848a36f2..766adaf2618c5 100644 ---- a/drivers/video/fbdev/offb.c -+++ b/drivers/video/fbdev/offb.c -@@ -354,7 +354,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - par->cmap_type = cmap_gxt2000; - } else if (of_node_name_prefix(dp, "vga,Display-")) { - /* Look for AVIVO initialized by SLOF */ -- struct device_node *pciparent = of_get_parent(dp); -+ struct device_node *pciparent __free(device_node) = of_get_parent(dp); - const u32 *vid, *did; - vid = of_get_property(pciparent, "vendor-id", NULL); - did = of_get_property(pciparent, "device-id", NULL); -@@ -366,7 +366,6 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - if (par->cmap_adr) - par->cmap_type = cmap_avivo; - } -- of_node_put(pciparent); - } else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) { - #ifdef __BIG_ENDIAN - const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 }; --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 3595dd6184f..eebae59984b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -74,7 +74,6 @@ nfs-avoid-infinite-loop-in-pnfs_update_layout.patch openrisc-call-setup_memory-earlier-in-the-init-seque.patch s390-iucv-fix-receive-buffer-virtual-vs-physical-add.patch usb-dwc3-core-skip-setting-event-buffers-for-host-on.patch -fbdev-offb-replace-of_node_put-with-__free-device_no.patch irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch ext4-set-the-type-of-max_zeroout-to-unsigned-int-to-.patch nvmet-rdma-fix-possible-bad-dereference-when-freeing.patch diff --git a/queue-5.15/fbdev-offb-replace-of_node_put-with-__free-device_no.patch b/queue-5.15/fbdev-offb-replace-of_node_put-with-__free-device_no.patch deleted file mode 100644 index a58591d7537..00000000000 --- a/queue-5.15/fbdev-offb-replace-of_node_put-with-__free-device_no.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9b7cb86683b052d647bcc6b28f576dfb53438f24 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 22 Apr 2024 21:20:21 -0400 -Subject: fbdev: offb: replace of_node_put with __free(device_node) - -From: Abdulrasaq Lawani - -[ Upstream commit ce4a7ae84a58b9f33aae8d6c769b3c94f3d5ce76 ] - -Replaced instance of of_node_put with __free(device_node) -to simplify code and protect against any memory leaks -due to future changes in the control flow. - -Suggested-by: Julia Lawall -Signed-off-by: Abdulrasaq Lawani -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - drivers/video/fbdev/offb.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c -index 4501e848a36f2..766adaf2618c5 100644 ---- a/drivers/video/fbdev/offb.c -+++ b/drivers/video/fbdev/offb.c -@@ -354,7 +354,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - par->cmap_type = cmap_gxt2000; - } else if (of_node_name_prefix(dp, "vga,Display-")) { - /* Look for AVIVO initialized by SLOF */ -- struct device_node *pciparent = of_get_parent(dp); -+ struct device_node *pciparent __free(device_node) = of_get_parent(dp); - const u32 *vid, *did; - vid = of_get_property(pciparent, "vendor-id", NULL); - did = of_get_property(pciparent, "device-id", NULL); -@@ -366,7 +366,6 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - if (par->cmap_adr) - par->cmap_type = cmap_avivo; - } -- of_node_put(pciparent); - } else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) { - #ifdef __BIG_ENDIAN - const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 }; --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index e99de7c5a1b..f412f589853 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -100,7 +100,6 @@ s390-iucv-fix-receive-buffer-virtual-vs-physical-add.patch clocksource-make-watchdog-and-suspend-timing-multipl.patch platform-x86-lg-laptop-fix-s-null-argument-warning.patch usb-dwc3-core-skip-setting-event-buffers-for-host-on.patch -fbdev-offb-replace-of_node_put-with-__free-device_no.patch irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch ext4-set-the-type-of-max_zeroout-to-unsigned-int-to-.patch nvmet-rdma-fix-possible-bad-dereference-when-freeing.patch diff --git a/queue-5.4/fbdev-offb-replace-of_node_put-with-__free-device_no.patch b/queue-5.4/fbdev-offb-replace-of_node_put-with-__free-device_no.patch deleted file mode 100644 index c62cf31ebbe..00000000000 --- a/queue-5.4/fbdev-offb-replace-of_node_put-with-__free-device_no.patch +++ /dev/null @@ -1,45 +0,0 @@ -From da3edf472393103b800f9fb7a9ab5cd1f4e2a955 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 22 Apr 2024 21:20:21 -0400 -Subject: fbdev: offb: replace of_node_put with __free(device_node) - -From: Abdulrasaq Lawani - -[ Upstream commit ce4a7ae84a58b9f33aae8d6c769b3c94f3d5ce76 ] - -Replaced instance of of_node_put with __free(device_node) -to simplify code and protect against any memory leaks -due to future changes in the control flow. - -Suggested-by: Julia Lawall -Signed-off-by: Abdulrasaq Lawani -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - drivers/video/fbdev/offb.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c -index fbc6eafb63c77..fcff3601b05cc 100644 ---- a/drivers/video/fbdev/offb.c -+++ b/drivers/video/fbdev/offb.c -@@ -354,7 +354,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - par->cmap_type = cmap_gxt2000; - } else if (of_node_name_prefix(dp, "vga,Display-")) { - /* Look for AVIVO initialized by SLOF */ -- struct device_node *pciparent = of_get_parent(dp); -+ struct device_node *pciparent __free(device_node) = of_get_parent(dp); - const u32 *vid, *did; - vid = of_get_property(pciparent, "vendor-id", NULL); - did = of_get_property(pciparent, "device-id", NULL); -@@ -366,7 +366,6 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp - if (par->cmap_adr) - par->cmap_type = cmap_avivo; - } -- of_node_put(pciparent); - } else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) { - #ifdef __BIG_ENDIAN - const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 }; --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 7bb41ee7eb2..c92c0eef52d 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -66,7 +66,6 @@ nfs-avoid-infinite-loop-in-pnfs_update_layout.patch openrisc-call-setup_memory-earlier-in-the-init-seque.patch s390-iucv-fix-receive-buffer-virtual-vs-physical-add.patch usb-dwc3-core-skip-setting-event-buffers-for-host-on.patch -fbdev-offb-replace-of_node_put-with-__free-device_no.patch irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch ext4-set-the-type-of-max_zeroout-to-unsigned-int-to-.patch nvmet-rdma-fix-possible-bad-dereference-when-freeing.patch