Get rid of last "easy" kernel symbols starting with __:
__assert -> kern_assert __sigtimedwait1 -> sigtimedwait1 __wdstart -> wdstart1 The rest are MD and/or shared with userspace, so they will require a little more involvement than what is available for this quick "ride the 5.99.24 bump" action.
This commit is contained in:
pooka
parent
f32c83c1bd
commit
654415b2b7
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kern_time_50.c,v 1.12 2009/11/11 09:48:50 rmind Exp $ */
|
||||
/* $NetBSD: kern_time_50.c,v 1.13 2010/01/19 22:28:31 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.12 2009/11/11 09:48:50 rmind Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.13 2010/01/19 22:28:31 pooka Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_aio.h"
|
||||
|
|
@ -629,7 +629,7 @@ compat_50_sys___sigtimedwait(struct lwp *l,
|
|||
const struct compat_50_sys___sigtimedwait_args *uap, register_t *retval)
|
||||
{
|
||||
|
||||
return __sigtimedwait1(l,
|
||||
return sigtimedwait1(l,
|
||||
(const struct sys_____sigtimedwait50_args *)uap, retval, copyout,
|
||||
tscopyin, tscopyout);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $ */
|
||||
/* $NetBSD: wd.c,v 1.382 2010/01/19 22:28:31 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.382 2010/01/19 22:28:31 pooka Exp $");
|
||||
|
||||
#include "opt_ata.h"
|
||||
|
||||
|
|
@ -175,7 +175,7 @@ void wdioctlstrategy(struct buf *);
|
|||
void wdgetdefaultlabel(struct wd_softc *, struct disklabel *);
|
||||
void wdgetdisklabel(struct wd_softc *);
|
||||
void wdstart(void *);
|
||||
void __wdstart(struct wd_softc*, struct buf *);
|
||||
void wdstart1(struct wd_softc*, struct buf *);
|
||||
void wdrestart(void *);
|
||||
void wddone(void *);
|
||||
int wd_get_params(struct wd_softc *, u_int8_t, struct ataparams *);
|
||||
|
|
@ -585,7 +585,7 @@ wdstart(void *arg)
|
|||
wd->openings--;
|
||||
|
||||
wd->retries = 0;
|
||||
__wdstart(wd, bp);
|
||||
wdstart1(wd, bp);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -623,7 +623,7 @@ wd_split_mod15_write(struct buf *bp)
|
|||
bp->b_data = (char *)bp->b_data + bp->b_bcount;
|
||||
bp->b_blkno += (bp->b_bcount / 512);
|
||||
bp->b_rawblkno += (bp->b_bcount / 512);
|
||||
__wdstart(sc, bp);
|
||||
wdstart1(sc, bp);
|
||||
return;
|
||||
|
||||
done:
|
||||
|
|
@ -636,7 +636,7 @@ wd_split_mod15_write(struct buf *bp)
|
|||
}
|
||||
|
||||
void
|
||||
__wdstart(struct wd_softc *wd, struct buf *bp)
|
||||
wdstart1(struct wd_softc *wd, struct buf *bp)
|
||||
{
|
||||
|
||||
/*
|
||||
|
|
@ -721,7 +721,7 @@ __wdstart(struct wd_softc *wd, struct buf *bp)
|
|||
case ATACMD_COMPLETE:
|
||||
break;
|
||||
default:
|
||||
panic("__wdstart: bad return code from ata_bio()");
|
||||
panic("wdstart1: bad return code from ata_bio()");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -831,7 +831,7 @@ wdrestart(void *v)
|
|||
ATADEBUG_PRINT(("wdrestart %s\n", device_xname(wd->sc_dev)),
|
||||
DEBUG_XFERS);
|
||||
s = splbio();
|
||||
__wdstart(v, bp);
|
||||
wdstart1(v, bp);
|
||||
splx(s);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sys_sig.c,v 1.25 2009/12/20 04:49:09 rmind Exp $ */
|
||||
/* $NetBSD: sys_sig.c,v 1.26 2010/01/19 22:28:31 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.25 2009/12/20 04:49:09 rmind Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.26 2010/01/19 22:28:31 pooka Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -315,7 +315,7 @@ sys_____sigtimedwait50(struct lwp *l,
|
|||
const struct sys_____sigtimedwait50_args *uap, register_t *retval)
|
||||
{
|
||||
|
||||
return __sigtimedwait1(l, uap, retval, copyout, copyin, copyout);
|
||||
return sigtimedwait1(l, uap, retval, copyout, copyin, copyout);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -620,7 +620,7 @@ sigaltstack1(struct lwp *l, const struct sigaltstack *nss,
|
|||
}
|
||||
|
||||
int
|
||||
__sigtimedwait1(struct lwp *l, const struct sys_____sigtimedwait50_args *uap,
|
||||
sigtimedwait1(struct lwp *l, const struct sys_____sigtimedwait50_args *uap,
|
||||
register_t *retval, copyout_t storeinf, copyin_t fetchts, copyout_t storets)
|
||||
{
|
||||
/* {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.libkern,v 1.8 2009/12/14 12:18:14 uebayasi Exp $
|
||||
# $NetBSD: Makefile.libkern,v 1.9 2010/01/19 22:28:30 pooka Exp $
|
||||
|
||||
#
|
||||
# Variable definitions for libkern.
|
||||
|
|
@ -55,7 +55,7 @@ SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
|
|||
.endif
|
||||
|
||||
# Other stuff
|
||||
SRCS+= __assert.c __main.c
|
||||
SRCS+= kern_assert.c __main.c
|
||||
SRCS+= __cmsg_alignbytes.c cpuset.c inet_addr.c intoa.c
|
||||
.if empty(SRCS:Mbyte_swap_8.*)
|
||||
SRCS+= bswap64.c
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: __assert.c,v 1.11 2007/09/24 14:19:03 pooka Exp $ */
|
||||
/* $NetBSD: kern_assert.c,v 1.1 2010/01/19 22:28:30 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Christopher G. Demetriou
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
#endif
|
||||
|
||||
void
|
||||
__kernassert(const char *t, const char *f, int l, const char *e)
|
||||
kern_assert(const char *t, const char *f, int l, const char *e)
|
||||
{
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: libkern.h,v 1.92 2009/07/21 14:55:33 joerg Exp $ */
|
||||
/* $NetBSD: libkern.h,v 1.93 2010/01/19 22:28:30 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -179,10 +179,10 @@ tolower(int ch)
|
|||
#else
|
||||
#ifdef __STDC__
|
||||
#define assert(e) (__predict_true((e)) ? (void)0 : \
|
||||
__kernassert("", __FILE__, __LINE__, #e))
|
||||
kern_assert("", __FILE__, __LINE__, #e))
|
||||
#else
|
||||
#define assert(e) (__predict_true((e)) ? (void)0 : \
|
||||
__kernassert("", __FILE__, __LINE__, "e"))
|
||||
kern_assert("", __FILE__, __LINE__, "e"))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -213,10 +213,10 @@ tolower(int ch)
|
|||
} while (/*CONSTCOND*/ 0)
|
||||
#ifdef __STDC__
|
||||
#define KASSERT(e) (__predict_true((e)) ? (void)0 : \
|
||||
__kernassert("diagnostic ", __FILE__, __LINE__, #e))
|
||||
kern_assert("diagnostic ", __FILE__, __LINE__, #e))
|
||||
#else
|
||||
#define KASSERT(e) (__predict_true((e)) ? (void)0 : \
|
||||
__kernassert("diagnostic ", __FILE__, __LINE__,"e"))
|
||||
kern_assert("diagnostic ", __FILE__, __LINE__,"e"))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -229,10 +229,10 @@ tolower(int ch)
|
|||
#else
|
||||
#ifdef __STDC__
|
||||
#define KDASSERT(e) (__predict_true((e)) ? (void)0 : \
|
||||
__kernassert("debugging ", __FILE__, __LINE__, #e))
|
||||
kern_assert("debugging ", __FILE__, __LINE__, #e))
|
||||
#else
|
||||
#define KDASSERT(e) (__predict_true((e)) ? (void)0 : \
|
||||
__kernassert("debugging ", __FILE__, __LINE__, "e"))
|
||||
kern_assert("debugging ", __FILE__, __LINE__, "e"))
|
||||
#endif
|
||||
#endif
|
||||
/*
|
||||
|
|
@ -298,7 +298,7 @@ int ffs(int);
|
|||
#define ffs(x) __builtin_ffs(x)
|
||||
#endif
|
||||
|
||||
void __kernassert(const char *, const char *, int, const char *);
|
||||
void kern_assert(const char *, const char *, int, const char *);
|
||||
unsigned int
|
||||
bcdtobin(unsigned int);
|
||||
unsigned int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: signalvar.h,v 1.75 2009/01/11 02:45:55 christos Exp $ */
|
||||
/* $NetBSD: signalvar.h,v 1.76 2010/01/19 22:28:31 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -179,8 +179,8 @@ void ksiginfo_free(ksiginfo_t *);
|
|||
void ksiginfo_queue_drain0(ksiginfoq_t *);
|
||||
|
||||
struct sys_____sigtimedwait50_args;
|
||||
int __sigtimedwait1(struct lwp *, const struct sys_____sigtimedwait50_args *,
|
||||
register_t *, copyout_t, copyin_t, copyout_t);
|
||||
int sigtimedwait1(struct lwp *, const struct sys_____sigtimedwait50_args *,
|
||||
register_t *, copyout_t, copyin_t, copyout_t);
|
||||
|
||||
void signotify(struct lwp *);
|
||||
int sigispending(struct lwp *, int);
|
||||
|
|
|
|||
Loading…
Reference in New Issue