diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h
index 778dc191c2658159dab4c5eedfd7dc4d7c5e6d19..fb7e2ef60825557e179e7287986d5fb5f6e3d291 100644
--- a/include/uapi/linux/kexec.h
+++ b/include/uapi/linux/kexec.h
@@ -54,9 +54,9 @@
  */
 struct kexec_segment {
 	const void *buf;
-	size_t bufsz;
+	__kernel_size_t bufsz;
 	const void *mem;
-	size_t memsz;
+	__kernel_size_t memsz;
 };
 
 #endif /* __KERNEL__ */
diff --git a/usr/include/Makefile b/usr/include/Makefile
index 3cd15af3266d94d6d77c54b84acd0927b4e0d2d1..0f59020ae5efb3cea6cc425d95962ef1f7e39240 100644
--- a/usr/include/Makefile
+++ b/usr/include/Makefile
@@ -28,7 +28,6 @@ no-header-test += linux/cyclades.h
 no-header-test += linux/errqueue.h
 no-header-test += linux/hdlc/ioctl.h
 no-header-test += linux/ivtv.h
-no-header-test += linux/kexec.h
 no-header-test += linux/matroxfb.h
 no-header-test += linux/omap3isp.h
 no-header-test += linux/omapfb.h