Skip to content

Commit

Permalink
mips: add asm/stat.h to UAPI compile-test coverage
Browse files Browse the repository at this point in the history
asm/stat.h is currently excluded from the UAPI compile-test for
ARCH=mips because of the errors like follows:

    HDRTEST usr/include/asm/stat.h
  In file included from <command-line>:32:
  ./usr/include/asm/stat.h:22:2: error: unknown type name 'ino_t'
     22 |  ino_t  st_ino;
        |  ^~~~~
  ./usr/include/asm/stat.h:23:2: error: unknown type name 'mode_t'
     23 |  mode_t  st_mode;
        |  ^~~~~~
  ./usr/include/asm/stat.h:25:2: error: unknown type name 'uid_t'
     25 |  uid_t  st_uid;
        |  ^~~~~
  ./usr/include/asm/stat.h:26:2: error: unknown type name 'gid_t'
     26 |  gid_t  st_gid;
        |  ^~~~~
  ./usr/include/asm/stat.h:58:2: error: unknown type name 'mode_t'
     58 |  mode_t  st_mode;
        |  ^~~~~~
  ./usr/include/asm/stat.h:61:2: error: unknown type name 'uid_t'
     61 |  uid_t  st_uid;
        |  ^~~~~
  ./usr/include/asm/stat.h:62:2: error: unknown type name 'gid_t'
     62 |  gid_t  st_gid;
        |  ^~~~~

The errors can be fixed by prefixing the types with __kernel_.

Then, remove the no-header-test entry from user/include/Makefile.

Signed-off-by: Masahiro Yamada <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
  • Loading branch information
masahir0y authored and arndb committed May 13, 2022
1 parent 5c41778 commit 8c1a381
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
20 changes: 10 additions & 10 deletions arch/mips/include/uapi/asm/stat.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
struct stat {
unsigned st_dev;
long st_pad1[3]; /* Reserved for network id */
ino_t st_ino;
mode_t st_mode;
__kernel_ino_t st_ino;
__kernel_mode_t st_mode;
__u32 st_nlink;
uid_t st_uid;
gid_t st_gid;
__kernel_uid_t st_uid;
__kernel_gid_t st_gid;
unsigned st_rdev;
long st_pad2[2];
long st_size;
Expand Down Expand Up @@ -55,11 +55,11 @@ struct stat64 {

unsigned long long st_ino;

mode_t st_mode;
__kernel_mode_t st_mode;
__u32 st_nlink;

uid_t st_uid;
gid_t st_gid;
__kernel_uid_t st_uid;
__kernel_gid_t st_gid;

unsigned long st_rdev;
unsigned long st_pad1[3]; /* Reserved for st_rdev expansion */
Expand Down Expand Up @@ -96,11 +96,11 @@ struct stat {

unsigned long st_ino;

mode_t st_mode;
__kernel_mode_t st_mode;
__u32 st_nlink;

uid_t st_uid;
gid_t st_gid;
__kernel_uid_t st_uid;
__kernel_gid_t st_gid;

unsigned int st_rdev;
unsigned int st_pad1[3]; /* Reserved for st_rdev expansion */
Expand Down
4 changes: 0 additions & 4 deletions usr/include/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ no-header-test += asm/sigcontext.h
no-header-test += linux/if_bonding.h
endif

ifeq ($(SRCARCH),mips)
no-header-test += asm/stat.h
endif

ifeq ($(SRCARCH),powerpc)
no-header-test += asm/stat.h
no-header-test += linux/bpf_perf_event.h
Expand Down

0 comments on commit 8c1a381

Please sign in to comment.