FAILED: patch "[PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors" failed to apply to 4.19-stable tree

FAILED: patch "[PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors" failed to apply to 4.19-stable tree

[gregkh]

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 9349e23907be1954ccdf6d771d640e2788da1643 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Thu, 1 Nov 2018 14:03:08 +0300
Subject: [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors

Consistently use types provided by <linux/types.h> via <drm/drm.h>
to fix the following linux/kfd_ioctl.h userspace compilation errors:

/usr/include/linux/kfd_ioctl.h:250:2: error: unknown type name 'uint32_t'
  uint32_t reset_type;
/usr/include/linux/kfd_ioctl.h:251:2: error: unknown type name 'uint32_t'
  uint32_t reset_cause;
/usr/include/linux/kfd_ioctl.h:252:2: error: unknown type name 'uint32_t'
  uint32_t memory_lost;
/usr/include/linux/kfd_ioctl.h:253:2: error: unknown type name 'uint32_t'
  uint32_t gpu_id;

Fixes: 0c119abad7f0d ("drm/amd: Add kfd ioctl defines for hw_exception event")
Cc: <stable@vger.kernel.org> # v4.19
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index f5ff8a76e208..dae897f38e59 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -255,10 +255,10 @@ struct kfd_hsa_memory_exception_data {
 
 /* hw exception data */
 struct kfd_hsa_hw_exception_data {
-	uint32_t reset_type;
-	uint32_t reset_cause;
-	uint32_t memory_lost;
-	uint32_t gpu_id;
+	__u32 reset_type;
+	__u32 reset_cause;
+	__u32 memory_lost;
+	__u32 gpu_id;
 };
 
 /* Event data */

Re: FAILED: patch "[PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors" failed to apply to 4.19-stable tree

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 2255 bytes --]

Hi,

On Sat, Jan 05, 2019 at 05:54:55PM +0100, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 4.19-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
> 
> thanks,
> 
> greg k-h

This patch has already been applied to the 4.19-stable tree
as commit id v4.19.3~55 (0d406e7972dd47c54959281782e05f52c8a10c95).

Thanks,

> ------------------ original commit in Linus's tree ------------------
> 
> >From 9349e23907be1954ccdf6d771d640e2788da1643 Mon Sep 17 00:00:00 2001
> From: "Dmitry V. Levin" <ldv@altlinux.org>
> Date: Thu, 1 Nov 2018 14:03:08 +0300
> Subject: [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors
> 
> Consistently use types provided by <linux/types.h> via <drm/drm.h>
> to fix the following linux/kfd_ioctl.h userspace compilation errors:
> 
> /usr/include/linux/kfd_ioctl.h:250:2: error: unknown type name 'uint32_t'
>   uint32_t reset_type;
> /usr/include/linux/kfd_ioctl.h:251:2: error: unknown type name 'uint32_t'
>   uint32_t reset_cause;
> /usr/include/linux/kfd_ioctl.h:252:2: error: unknown type name 'uint32_t'
>   uint32_t memory_lost;
> /usr/include/linux/kfd_ioctl.h:253:2: error: unknown type name 'uint32_t'
>   uint32_t gpu_id;
> 
> Fixes: 0c119abad7f0d ("drm/amd: Add kfd ioctl defines for hw_exception event")
> Cc: <stable@vger.kernel.org> # v4.19
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> 
> diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
> index f5ff8a76e208..dae897f38e59 100644
> --- a/include/uapi/linux/kfd_ioctl.h
> +++ b/include/uapi/linux/kfd_ioctl.h
> @@ -255,10 +255,10 @@ struct kfd_hsa_memory_exception_data {
>  
>  /* hw exception data */
>  struct kfd_hsa_hw_exception_data {
> -	uint32_t reset_type;
> -	uint32_t reset_cause;
> -	uint32_t memory_lost;
> -	uint32_t gpu_id;
> +	__u32 reset_type;
> +	__u32 reset_cause;
> +	__u32 memory_lost;
> +	__u32 gpu_id;
>  };
>  
>  /* Event data */

-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]