diff options
| author | Stefan Fritsch <sf@cvs.openbsd.org> | 2013-07-03 15:34:49 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@cvs.openbsd.org> | 2013-07-03 15:34:49 +0000 |
| commit | 1216a674afebf0b4b5d92e389f804a756be2e912 (patch) | |
| tree | c9a6fad48267473d1b51ab588b2f3b02d0125dd6 /sys | |
| parent | edac72af4a900f01ba73958401bb5651be8f45ad (diff) | |
fix: cast void * to char *, fix format args for (u)int64_t,
tc_frequency is unsigned
ok kettenis@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/db_disasm.c | 4 | ||||
| -rw-r--r-- | sys/dev/acpi/acpithinkpad.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/amdpm.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/db_disasm.c b/sys/arch/i386/i386/db_disasm.c index c9446a0b26c..632f5e03120 100644 --- a/sys/arch/i386/i386/db_disasm.c +++ b/sys/arch/i386/i386/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.15 2007/09/01 11:54:02 miod Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.16 2013/07/03 15:34:48 sf Exp $ */ /* $NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $ */ /* @@ -1192,7 +1192,7 @@ db_disasm(db_addr_t loc, boolean_t altfmt) if (size == WORD) db_printf("%s", i_name); else - db_printf("%s", ip->i_extra); + db_printf("%s", (char *)ip->i_extra); } else { db_printf("%s", i_name); if (i_size != NONE) { diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c index 511fc1584da..1499e552502 100644 --- a/sys/dev/acpi/acpithinkpad.c +++ b/sys/dev/acpi/acpithinkpad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpithinkpad.c,v 1.30 2013/04/02 00:46:47 jcs Exp $ */ +/* $OpenBSD: acpithinkpad.c,v 1.31 2013/07/03 15:34:48 sf Exp $ */ /* * Copyright (c) 2008 joshua stein <jcs@openbsd.org> * @@ -347,7 +347,7 @@ thinkpad_hotkey(struct aml_node *node, int notify_type, void *arg) handled = 1; break; default: - printf("%s: unknown event 0x%03x\n", + printf("%s: unknown event 0x%03llx\n", DEVNAME(sc), event); } } diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c index 6fea65c5247..541070118e8 100644 --- a/sys/dev/pci/amdpm.c +++ b/sys/dev/pci/amdpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdpm.c,v 1.29 2013/05/30 16:15:02 deraadt Exp $ */ +/* $OpenBSD: amdpm.c,v 1.30 2013/07/03 15:34:48 sf Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -247,7 +247,7 @@ amdpm_attach(struct device *parent, struct device *self, void *aux) (cfg_reg & AMDPM_STOPTMR) == 0 && (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_PBC768_PMC || PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_8111_PMC)) { - printf(": %d-bit timer at %dHz", + printf(": %d-bit timer at %lluHz", (cfg_reg & AMDPM_TMR32) ? 32 : 24, amdpm_timecounter.tc_frequency); |