From 16d0e910e6ccf9bfdbdd53065e696e3c09c1db01 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 11 Jun 2023 16:03:49 +0200 Subject: [PATCH] 5.10-stable patches added patches: staging-vc04_services-fix-gcc-13-build-warning.patch --- queue-5.10/series | 1 + ...04_services-fix-gcc-13-build-warning.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 queue-5.10/staging-vc04_services-fix-gcc-13-build-warning.patch diff --git a/queue-5.10/series b/queue-5.10/series index 58ba7e5f175..2359e9c748d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -51,3 +51,4 @@ rbd-get-snapshot-context-after-exclusive-lock-is-ensured-to-be-held.patch pinctrl-meson-axg-add-missing-gpioa_18-gpio-group.patch usb-usbfs-enforce-page-requirements-for-mmap.patch usb-usbfs-use-consistent-mmap-functions.patch +staging-vc04_services-fix-gcc-13-build-warning.patch diff --git a/queue-5.10/staging-vc04_services-fix-gcc-13-build-warning.patch b/queue-5.10/staging-vc04_services-fix-gcc-13-build-warning.patch new file mode 100644 index 00000000000..fc5d239afa0 --- /dev/null +++ b/queue-5.10/staging-vc04_services-fix-gcc-13-build-warning.patch @@ -0,0 +1,36 @@ +From foo@baz Sun Jun 11 03:39:46 PM CEST 2023 +Date: Sun, 11 Jun 2023 15:39:46 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: staging: vc04_services: fix gcc-13 build warning + +Not upstream as newer kernels fixed this properly. + +Fix up a mismatched function prototype warning in the vc04_services +driver that gcc-13 shows. + +Signed-off-by: Greg Kroah-Hartman +--- + drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +@@ -2315,7 +2315,7 @@ vchiq_arm_init_state(struct vchiq_state + return VCHIQ_SUCCESS; + } + +-enum vchiq_status ++int + vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service, + enum USE_TYPE_E use_type) + { +@@ -2375,7 +2375,7 @@ out: + return ret; + } + +-enum vchiq_status ++int + vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service) + { + struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state); -- 2.47.2