Author: dchagin
Date: Tue Jan 6 18:53:09 2015
New Revision: 276758
URL: https://svnweb.freebsd.org/changeset/base/276758
Log:
kdump: eliminate new clang warnings.
MFC after: 1 week
Modified:
head/usr.bin/kdump/Makefile
head/usr.bin/kdump/kdump.c
Modified: head/usr.bin/kdump/Makefile
==============================================================================
--- head/usr.bin/kdump/Makefile Tue Jan 6 18:25:10 2015 (r276757)
+++ head/usr.bin/kdump/Makefile Tue Jan 6 18:53:09 2015 (r276758)
@@ -23,13 +23,13 @@ CFLAGS+=-DHAVE_LIBCAPSICUM
CFLAGS+=-DPF
.endif
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-SRCS+= linux_syscalls.c
-.endif
-
NO_WERROR?= YES
-CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
+CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h
+
+.if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386")
+CLEANFILES+= linux_syscalls.c
+.endif
ioctl.c: mkioctls
env MACHINE=${MACHINE} CPP="${CPP}" \
@@ -41,11 +41,9 @@ kdump_subr.h: mksubr
kdump_subr.c: mksubr kdump_subr.h
sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET}
-
-linux_syscalls.c:
- /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
+.if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386")
+ sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
${.CURDIR}/../../sys/${MACHINE_ARCH}/linux${SFX}/syscalls.master
${.CURDIR}/linux_syscalls.conf
- echo "int nlinux_syscalls = sizeof(linux_syscallnames) /
sizeof(linux_syscallnames[0]);" \
- >> linux_syscalls.c
+.endif
.include <bsd.prog.mk>
Modified: head/usr.bin/kdump/kdump.c
==============================================================================
--- head/usr.bin/kdump/kdump.c Tue Jan 6 18:25:10 2015 (r276757)
+++ head/usr.bin/kdump/kdump.c Tue Jan 6 18:53:09 2015 (r276758)
@@ -148,8 +148,11 @@ static struct ktr_header ktr_header;
void linux_ktrsyscall(struct ktr_syscall *);
void linux_ktrsysret(struct ktr_sysret *);
-extern char *linux_syscallnames[];
-extern int nlinux_syscalls;
+extern const char *linux_syscallnames[];
+
+#include <linux_syscalls.c>
+static int nlinux_syscalls = sizeof(linux_syscallnames) / \
+ sizeof(linux_syscallnames[0]);
/*
* from linux.h
@@ -1934,7 +1937,7 @@ void
ktrfault(struct ktr_fault *ktr)
{
- printf("0x%jx ", ktr->vaddr);
+ printf("0x%jx ", (uintmax_t)ktr->vaddr);
vmprotname(ktr->type);
printf("\n");
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
