diff options
| author | dim <dim@FreeBSD.org> | 2010-11-14 20:47:30 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-14 20:47:30 +0000 |
| commit | b355314642d1e24edf4e05d08b793f8b9ea76458 (patch) | |
| tree | 06fb324a8697fbee8ca1e10b6e5ed702632baffc /lib | |
| parent | 466abdddb672857d5af81ed2471904a9b734a52b (diff) | |
| download | FreeBSD-src-b355314642d1e24edf4e05d08b793f8b9ea76458.zip FreeBSD-src-b355314642d1e24edf4e05d08b793f8b9ea76458.tar.gz | |
Sync: merge r215273 through r215318 from ^/head.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/pututxline.c | 3 | ||||
| -rw-r--r-- | lib/libkvm/kvm.c | 7 | ||||
| -rw-r--r-- | lib/libkvm/kvm_pcpu.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/lib/libc/gen/pututxline.c b/lib/libc/gen/pututxline.c index 3b2c7a8..5a9bab9 100644 --- a/lib/libc/gen/pututxline.c +++ b/lib/libc/gen/pututxline.c @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/endian.h> #include <sys/stat.h> #include <sys/uio.h> +#include <errno.h> #include <fcntl.h> #include <stdio.h> #include <string.h> @@ -53,6 +54,7 @@ futx_open(const char *file) /* Safety check: never use broken files. */ if (_fstat(fd, &sb) != -1 && sb.st_size % sizeof(struct futx) != 0) { _close(fd); + errno = EINVAL; return (NULL); } @@ -142,6 +144,7 @@ utx_active_remove(struct futx *fu) } fclose(fp); + errno = ESRCH; return (1); } diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index 37f6a72..b6d3bcd 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -50,6 +50,7 @@ static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94"; #include <sys/stat.h> #include <sys/sysctl.h> #include <sys/linker.h> +#include <sys/pcpu.h> #include <net/vnet.h> @@ -433,7 +434,7 @@ _kvm_nlist(kvm_t *kd, struct nlist *nl, int initialize) if (error > 0 && _kvm_dpcpu_initialized(kd, initialize)) error = kvm_fdnlist_prefix(kd, nl, error, - "pcpu_entry_", _kvm_dpcpu_validaddr); + DPCPU_SYMPREFIX, _kvm_dpcpu_validaddr); return (error); } @@ -473,7 +474,7 @@ again: p->n_value = _kvm_vnet_validaddr(kd, lookup.symvalue); else if (_kvm_dpcpu_initialized(kd, initialize) && - !strcmp(prefix, "pcpu_entry_")) + !strcmp(prefix, DPCPU_SYMPREFIX)) p->n_value = _kvm_dpcpu_validaddr(kd, lookup.symvalue); else @@ -495,7 +496,7 @@ again: } if (error && _kvm_dpcpu_initialized(kd, initialize) && !tried_dpcpu) { tried_dpcpu = 1; - prefix = "pcpu_entry_"; + prefix = DPCPU_SYMPREFIX; goto again; } diff --git a/lib/libkvm/kvm_pcpu.c b/lib/libkvm/kvm_pcpu.c index 484d2ea..d896c4f 100644 --- a/lib/libkvm/kvm_pcpu.c +++ b/lib/libkvm/kvm_pcpu.c @@ -197,9 +197,9 @@ _kvm_dpcpu_init(kvm_t *kd) { struct nlist nl[] = { #define NLIST_START_SET_PCPU 0 - { "___start_set_pcpu" }, + { "___start_" DPCPU_SETNAME }, #define NLIST_STOP_SET_PCPU 1 - { "___stop_set_pcpu" }, + { "___stop_" DPCPU_SETNAME }, #define NLIST_DPCPU_OFF 2 { "_dpcpu_off" }, #define NLIST_MP_MAXCPUS 3 |
