[PATCH V2] rust: uapi: replace direct asm-generic/ioctl.h include with linux/ioctl.h

[PATCH V2] rust: uapi: replace direct asm-generic/ioctl.h include with linux/ioctl.h

[Mukesh Kumar Chaurasiya (IBM)]

rust/uapi/uapi_helper.h was directly including <uapi/asm-generic/ioctl.h>
instead of the proper <uapi/linux/ioctl.h>.

On powerpc, <uapi/linux/ioctl.h> pulls in <uapi/asm/ioctl.h> first, which
defines _IOC_SIZEBITS, _IOC_DIRBITS, _IOC_NONE, and _IOC_WRITE with the
arch-specific values, before falling through to <asm-generic/ioctl.h>.
By bypassing that chain and including <asm-generic/ioctl.h> directly,
the arch-specific overrides never ran first, so when other headers in
the compilation later brought in the full arch-aware chain, Clang saw
those four macros being defined a second time and emitted:

clang diag: arch/powerpc/include/uapi/asm/ioctl.h:5:9: warning: '_IOC_SIZEBITS' macro redefined [-Wmacro-redefined]
clang diag: arch/powerpc/include/uapi/asm/ioctl.h:6:9: warning: '_IOC_DIRBITS' macro redefined [-Wmacro-redefined]
clang diag: arch/powerpc/include/uapi/asm/ioctl.h:8:9: warning: '_IOC_NONE' macro redefined [-Wmacro-redefined]
clang diag: arch/powerpc/include/uapi/asm/ioctl.h:10:9: warning: '_IOC_WRITE' macro redefined [-Wmacro-redefined]

Fix this by replacing the direct include of <uapi/asm-generic/ioctl.h>
with <uapi/linux/ioctl.h>, which is the correct arch-aware entry point
and already maintains the intended include order.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202608050618.9dekfjtF-lkp@intel.com/
Signed-off-by: Mukesh Kumar Chaurasiya (IBM) <mkchauras@gmail.com>
---
Applies on linux-next.
Change Log:

V1 -> V2:
 - Put the original warning instead of trimmed
 - Put the base repo after "---"
V1: https://lore.kernel.org/all/20260808032143.2767112-1-mkchauras@gmail.com/

 rust/uapi/uapi_helper.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/uapi/uapi_helper.h b/rust/uapi/uapi_helper.h
index 86c7b6b284b0..489748ef642c 100644
--- a/rust/uapi/uapi_helper.h
+++ b/rust/uapi/uapi_helper.h
@@ -6,12 +6,12 @@
  * Sorted alphabetically.
  */
 
-#include <uapi/asm-generic/ioctl.h>
 #include <uapi/drm/drm.h>
 #include <uapi/drm/nova_drm.h>
 #include <uapi/drm/panthor_drm.h>
 #include <uapi/linux/android/binder.h>
 #include <uapi/linux/android/binder_netlink.h>
+#include <uapi/linux/ioctl.h>
 #include <uapi/linux/mdio.h>
 #include <uapi/linux/mii.h>
 #include <uapi/linux/ethtool.h>

base-commit: 3d08ff75a47a3e7e2ab45a3bcab6723b4d906422
-- 
2.55.0

Re: [PATCH V2] rust: uapi: replace direct asm-generic/ioctl.h include with linux/ioctl.h

[Miguel Ojeda]

On Tue, Aug 11, 2026 at 8:34 AM Mukesh Kumar Chaurasiya (IBM)
<mkchauras@gmail.com> wrote:
>
> rust/uapi/uapi_helper.h was directly including <uapi/asm-generic/ioctl.h>
> instead of the proper <uapi/linux/ioctl.h>.
>
> On powerpc, <uapi/linux/ioctl.h> pulls in <uapi/asm/ioctl.h> first, which
> defines _IOC_SIZEBITS, _IOC_DIRBITS, _IOC_NONE, and _IOC_WRITE with the
> arch-specific values, before falling through to <asm-generic/ioctl.h>.
> By bypassing that chain and including <asm-generic/ioctl.h> directly,
> the arch-specific overrides never ran first, so when other headers in
> the compilation later brought in the full arch-aware chain, Clang saw
> those four macros being defined a second time and emitted:
>
> clang diag: arch/powerpc/include/uapi/asm/ioctl.h:5:9: warning: '_IOC_SIZEBITS' macro redefined [-Wmacro-redefined]
> clang diag: arch/powerpc/include/uapi/asm/ioctl.h:6:9: warning: '_IOC_DIRBITS' macro redefined [-Wmacro-redefined]
> clang diag: arch/powerpc/include/uapi/asm/ioctl.h:8:9: warning: '_IOC_NONE' macro redefined [-Wmacro-redefined]
> clang diag: arch/powerpc/include/uapi/asm/ioctl.h:10:9: warning: '_IOC_WRITE' macro redefined [-Wmacro-redefined]
>
> Fix this by replacing the direct include of <uapi/asm-generic/ioctl.h>
> with <uapi/linux/ioctl.h>, which is the correct arch-aware entry point
> and already maintains the intended include order.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202608050618.9dekfjtF-lkp@intel.com/
> Signed-off-by: Mukesh Kumar Chaurasiya (IBM) <mkchauras@gmail.com>

Applied to `rust-next` -- thanks!

    Fixes: 4e1746656839 ("rust: uapi: Add UAPI crate")

We could, in principle, backport it if you think there may be
downstream users that may backport powerpc -- I wanted to at least
have the Fixes: tag even if not the Cc: stable@ so that they could
find this commit if needed.

Cheers,
Miguel