On 2024-10-31 6:47, Zhu Lingshan wrote: > The header usr/linux/kfd_ioctl.h is a duplicate of uapi/linux/kfd_ioctl.h. I don't see usr/linux/kfd_ioctl.h. Which branch are you looking at? > And it is actually not a file in the source code tree. If it's a file that only there on your local working tree, maybe just clean up your working tree. > Ideally, the usr version should be updated whenever the source code is recompiled. If the usr version is not in the git repository, it doesn't need to be updated. I don't know where this is coming from on your local tree. Regards, Felix > > However, I have noticed a discrepancy between the two headers > even after rebuilding the kernel. > > This commit modifies kfd_priv.h to always include the header from uapi to ensure > the latest changes are reflected. We should always include the source > code header other than the duplication. > > Signed-off-by: Zhu Lingshan <lingshan.zhu@xxxxxxx> > --- > drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h > index 26e48fdc8728..78de7ac09e8a 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h > @@ -32,7 +32,7 @@ > #include <linux/atomic.h> > #include <linux/workqueue.h> > #include <linux/spinlock.h> > -#include <linux/kfd_ioctl.h> > +#include <uapi/linux/kfd_ioctl.h> > #include <linux/idr.h> > #include <linux/kfifo.h> > #include <linux/seq_file.h>
