Skip to content

Commit baf4018

Browse files
author
Baoquan He
committed
kexec.h: add linux/kexec.h to UAPI compile-test coverage
JIRA: https://issues.redhat.com/browse/RHEL-32199 Upstream Status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Conflict: There's conflict in usr/include/Makefile hunk. commit 8b4bca2 Author: Masahiro Yamada <masahiroy@kernel.org> Date: Thu Feb 10 11:11:28 2022 +0900 kexec.h: add linux/kexec.h to UAPI compile-test coverage linux/kexec.h is currently excluded from the UAPI compile-test because of the errors like follows: HDRTEST usr/include/linux/kexec.h In file included from <command-line>: ./usr/include/linux/kexec.h:56:9: error: unknown type name ‘size_t’ 56 | size_t bufsz; | ^~~~~~ ./usr/include/linux/kexec.h:58:9: error: unknown type name ‘size_t’ 58 | size_t memsz; | ^~~~~~ The errors can be fixed by replacing size_t with __kernel_size_t. Then, remove the no-header-test entry from user/include/Makefile. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Baoquan He <bhe@redhat.com>
1 parent 2b8c985 commit baf4018

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

include/uapi/linux/kexec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
*/
5656
struct kexec_segment {
5757
const void *buf;
58-
size_t bufsz;
58+
__kernel_size_t bufsz;
5959
const void *mem;
60-
size_t memsz;
60+
__kernel_size_t memsz;
6161
};
6262

6363
#endif /* __KERNEL__ */

usr/include/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ no-header-test += linux/errqueue.h
3333
no-header-test += linux/fsmap.h
3434
no-header-test += linux/hdlc/ioctl.h
3535
no-header-test += linux/ivtv.h
36-
no-header-test += linux/kexec.h
3736
no-header-test += linux/matroxfb.h
3837
no-header-test += linux/nfc.h
3938
no-header-test += linux/omap3isp.h

0 commit comments

Comments
 (0)