d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdump: eliminate new clang warnings.

Browse Source 
MFC after:	1 week
This commit is contained in:
Dmitry Chagin 2015-01-06 18:53:09 +00:00
parent a1cbd04334
commit 78ec874dd3
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/kdump/Makefile
View File

@ -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>

9
usr.bin/kdump/kdump.c
View File

@ -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");
}