diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-26 20:44:46 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-06-11 09:31:51 +0300 |
| commit | 6cdd461fe55315d9bc0ba40ea7da22cddbdcf784 (patch) | |
| tree | b05f3fdee0d380b92aa1c70086b5009162dfbeab | |
| parent | eb7a235af24981be82a88a125b4f82093a408ef4 (diff) | |
| download | illumos-joyent-6cdd461fe55315d9bc0ba40ea7da22cddbdcf784.tar.gz | |
12803 unix: duplicate symbols in the kernel
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
| -rw-r--r-- | usr/src/uts/common/os/space.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/vm/vm_swap.c | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/usr/src/uts/common/os/space.c b/usr/src/uts/common/os/space.c index 3fd8275df0..c8dfe360da 100644 --- a/usr/src/uts/common/os/space.c +++ b/usr/src/uts/common/os/space.c @@ -93,8 +93,6 @@ int __lintzero; /* Alway zero for shutting up lint */ pfn_t physmax; pgcnt_t physinstalled; -struct var v; - #include <sys/systm.h> #include <sys/conf.h> #include <sys/kmem.h> diff --git a/usr/src/uts/common/vm/vm_swap.c b/usr/src/uts/common/vm/vm_swap.c index 2a008e114b..1074137a8f 100644 --- a/usr/src/uts/common/vm/vm_swap.c +++ b/usr/src/uts/common/vm/vm_swap.c @@ -28,7 +28,7 @@ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* * University Copyright- Copyright (c) 1982, 1986, 1988 @@ -108,7 +108,7 @@ kmutex_t swapinfo_lock; /* * protected by the swapinfo_lock */ -struct swapinfo *swapinfo; +extern struct swapinfo *swapinfo; static struct swapinfo *silast; static int nswapfiles; @@ -136,7 +136,7 @@ uint_t swapalloc_maxcontig; * Allocate a range of up to *lenp contiguous slots (page) from a physical * swap device. Flags are one of: * SA_NOT Must have a slot from a physical swap device other than the - * the one containing input (*vpp, *offp). + * the one containing input (*vpp, *offp). * Less slots than requested may be returned. *lenp allocated slots are * returned starting at *offp on *vpp. * Returns 1 for a successful allocation, 0 for couldn't allocate any slots. @@ -407,8 +407,8 @@ swap_in_range(struct vnode *vp, u_offset_t offset, size_t len) */ static struct vnode * swapdel_byname( - char *name, /* pathname to delete */ - ulong_t lowblk) /* Low block number of area to delete */ + char *name, /* pathname to delete */ + ulong_t lowblk) /* Low block number of area to delete */ { struct swapinfo **sipp, *osip; u_offset_t soff; @@ -1406,7 +1406,7 @@ swapdel( cvp = common_specvp(vp); - lowblk = lowblk ? lowblk : 1; /* Skip first page (disk label) */ + lowblk = lowblk ? lowblk : 1; /* Skip first page (disk label) */ soff = ptob(btopr(lowblk << SCTRSHFT)); /* must be page aligned */ mutex_enter(&swapinfo_lock); @@ -1682,8 +1682,8 @@ again: * always include the requested offset or fail. Returns the offsets * backed as [*offp, *offp + *lenp) and the physical offsets used to * back them from *pvpp in the range [*pstartp, *pstartp + *lenp). - * Returns 0 for success - * SE_NOANON -- no anon slot for requested paged + * Returns 0 for success + * SE_NOANON -- no anon slot for requested paged * SE_NOSWAP -- no physical swap space available */ int @@ -1796,7 +1796,7 @@ swap_newphysname( /* * Get the physical swap backing store location for a given anonymous page * named (vp, off). The backing store name is returned in (*pvpp, *poffp). - * Returns 0 success + * Returns 0 success * EIDRM -- no anon slot (page is not allocated) */ int |