diff options
| author | dchagin <dchagin@FreeBSD.org> | 2015-01-06 18:53:09 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2015-01-06 18:53:09 +0000 |
| commit | 0ef5ebd1f79ac2ea8a513919098fce6d5c6fda18 (patch) | |
| tree | 9f2e8cc82f7d0d016cd89c039a051fd65c1847ce /usr.bin/kdump | |
| parent | de9e60f9e9aeb0f092d21264097820f0ce2ee421 (diff) | |
| download | FreeBSD-src-0ef5ebd1f79ac2ea8a513919098fce6d5c6fda18.zip FreeBSD-src-0ef5ebd1f79ac2ea8a513919098fce6d5c6fda18.tar.gz | |
kdump: eliminate new clang warnings.
MFC after: 1 week
Diffstat (limited to 'usr.bin/kdump')
| -rw-r--r-- | usr.bin/kdump/Makefile | 18 | ||||
| -rw-r--r-- | usr.bin/kdump/kdump.c | 9 |
2 files changed, 14 insertions, 13 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index 94caaa9..c295038 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -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> diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index e0a6079..ad29bfd 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -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"); } |
