summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/ic/aic79xx.c5
-rw-r--r--sys/dev/pci/ahd_pci.c5
-rw-r--r--sys/dev/pci/drm/i915/i915_vgpu.c9
-rw-r--r--sys/dev/usb/uhci.c6
-rw-r--r--sys/dev/wscons/wskbdutil.c5
-rw-r--r--sys/net/pipex.c57
-rw-r--r--sys/net/pipex_local.h7
7 files changed, 49 insertions, 45 deletions
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index e59d8956bc7..45e85b3a29b 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx.c,v 1.64 2018/02/06 00:18:38 tedu Exp $ */
+/* $OpenBSD: aic79xx.c,v 1.65 2019/01/31 18:01:14 millert Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -269,11 +269,10 @@ int ahd_createdmamem(struct ahd_softc *, size_t, struct map_node *,
void ahd_freedmamem(struct ahd_softc *, struct map_node *);
/******************************** Private Inlines *****************************/
-__inline void ahd_assert_atn(struct ahd_softc *ahd);
int ahd_currently_packetized(struct ahd_softc *ahd);
int ahd_set_active_fifo(struct ahd_softc *ahd);
-__inline void
+static inline void
ahd_assert_atn(struct ahd_softc *ahd)
{
ahd_outb(ahd, SCSISIGO, ATNO);
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c
index 0711e3332a1..054cca58fd1 100644
--- a/sys/dev/pci/ahd_pci.c
+++ b/sys/dev/pci/ahd_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahd_pci.c,v 1.24 2014/07/12 18:48:51 tedu Exp $ */
+/* $OpenBSD: ahd_pci.c,v 1.25 2019/01/31 18:01:14 millert Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -75,8 +75,7 @@
#include <dev/pci/pcivar.h>
-__inline uint64_t ahd_compose_id(u_int, u_int, u_int, u_int);
-__inline uint64_t
+static inline uint64_t
ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
{
uint64_t id;
diff --git a/sys/dev/pci/drm/i915/i915_vgpu.c b/sys/dev/pci/drm/i915/i915_vgpu.c
index e295ecb15e5..78b93062248 100644
--- a/sys/dev/pci/drm/i915/i915_vgpu.c
+++ b/sys/dev/pci/drm/i915/i915_vgpu.c
@@ -6,3 +6,12 @@ void
i915_check_vgpu(struct drm_device *dev)
{
}
+
+int intel_vgt_balloon(struct drm_device *dev)
+{
+ return 0;
+}
+
+void intel_vgt_deballoon(void)
+{
+}
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index b1acf72c710..5c499cbe69f 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.144 2018/11/16 11:57:29 mpi Exp $ */
+/* $OpenBSD: uhci.c,v 1.145 2019/01/31 18:01:14 millert Exp $ */
/* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -190,7 +190,7 @@ usbd_status uhci_device_setintr(struct uhci_softc *sc,
void uhci_device_clear_toggle(struct usbd_pipe *pipe);
-__inline__ struct uhci_soft_qh *uhci_find_prev_qh(struct uhci_soft_qh *,
+static inline struct uhci_soft_qh *uhci_find_prev_qh(struct uhci_soft_qh *,
struct uhci_soft_qh *);
#ifdef UHCI_DEBUG
@@ -314,7 +314,7 @@ struct usbd_pipe_methods uhci_device_isoc_methods = {
} while (0)
#define uhci_active_intr_list(ex) ((ex)->inext.le_prev != NULL)
-__inline__ struct uhci_soft_qh *
+static inline struct uhci_soft_qh *
uhci_find_prev_qh(struct uhci_soft_qh *pqh, struct uhci_soft_qh *sqh)
{
DPRINTFN(15,("uhci_find_prev_qh: pqh=%p sqh=%p\n", pqh, sqh));
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index c2b553186eb..9cca6eea7a9 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbdutil.c,v 1.17 2018/01/22 12:20:54 fcambus Exp $ */
+/* $OpenBSD: wskbdutil.c,v 1.18 2019/01/31 18:01:14 millert Exp $ */
/* $NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $ */
/*-
@@ -181,11 +181,10 @@ static struct compose_tab_s {
static int compose_tab_inorder = 0;
-inline int compose_tab_cmp(struct compose_tab_s *, struct compose_tab_s *);
keysym_t ksym_upcase(keysym_t);
void fillmapentry(const keysym_t *, int, struct wscons_keymap *);
-inline int
+static inline int
compose_tab_cmp(struct compose_tab_s *i, struct compose_tab_s *j)
{
if (i->elem[0] == j->elem[0])
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index 626bfacdbe6..44564d3281c 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pipex.c,v 1.106 2017/11/20 10:35:24 mpi Exp $ */
+/* $OpenBSD: pipex.c,v 1.107 2019/01/31 18:01:14 millert Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -2224,6 +2224,34 @@ pipex_l2tp_userland_output(struct mbuf *m0, struct pipex_session *session)
* MPPE
***********************************************************************/
#define PIPEX_COHERENCY_CNT_MASK 0x0fff
+
+static inline int
+pipex_mppe_setkey(struct pipex_mppe *mppe)
+{
+ rc4_keysetup(&mppe->rc4ctx, mppe->session_key, mppe->keylen);
+
+ return (0);
+}
+
+static inline int
+pipex_mppe_setoldkey(struct pipex_mppe *mppe, uint16_t coher_cnt)
+{
+ KASSERT(mppe->old_session_keys != NULL);
+
+ rc4_keysetup(&mppe->rc4ctx,
+ mppe->old_session_keys[coher_cnt & PIPEX_MPPE_OLDKEYMASK],
+ mppe->keylen);
+
+ return (0);
+}
+
+static inline void
+pipex_mppe_crypt(struct pipex_mppe *mppe, int len, u_char *indata,
+ u_char *outdata)
+{
+ rc4_crypt(&mppe->rc4ctx, indata, outdata, len);
+}
+
Static void
pipex_mppe_init(struct pipex_mppe *mppe, int stateless, int keylenbits,
u_char *master_key, int has_oldkey)
@@ -2927,33 +2955,6 @@ pipex_sockaddr_compar_addr(struct sockaddr *a, struct sockaddr *b)
return (-1);
}
-Static inline int
-pipex_mppe_setkey(struct pipex_mppe *mppe)
-{
- rc4_keysetup(&mppe->rc4ctx, mppe->session_key, mppe->keylen);
-
- return (0);
-}
-
-Static inline int
-pipex_mppe_setoldkey(struct pipex_mppe *mppe, uint16_t coher_cnt)
-{
- KASSERT(mppe->old_session_keys != NULL);
-
- rc4_keysetup(&mppe->rc4ctx,
- mppe->old_session_keys[coher_cnt & PIPEX_MPPE_OLDKEYMASK],
- mppe->keylen);
-
- return (0);
-}
-
-Static inline void
-pipex_mppe_crypt(struct pipex_mppe *mppe, int len, u_char *indata,
- u_char *outdata)
-{
- rc4_crypt(&mppe->rc4ctx, indata, outdata, len);
-}
-
int
pipex_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
size_t newlen)
diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h
index 218a9b71ba3..597027cf027 100644
--- a/sys/net/pipex_local.h
+++ b/sys/net/pipex_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pipex_local.h,v 1.29 2017/07/27 05:57:04 yasuoka Exp $ */
+/* $OpenBSD: pipex_local.h,v 1.30 2019/01/31 18:01:14 millert Exp $ */
/*
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -387,7 +387,7 @@ Static struct pipex_session *pipex_lookup_by_ip_address (struct in_addr);
Static struct pipex_session *pipex_lookup_by_session_id (int, int);
Static void pipex_ip_output (struct mbuf *, struct pipex_session *);
Static void pipex_ppp_output (struct mbuf *, struct pipex_session *, int);
-Static inline int pipex_ppp_proto (struct mbuf *, struct pipex_session *, int, int *);
+Static int pipex_ppp_proto (struct mbuf *, struct pipex_session *, int, int *);
Static void pipex_ppp_input (struct mbuf *, struct pipex_session *, int);
Static void pipex_ip_input (struct mbuf *, struct pipex_session *);
#ifdef INET6
@@ -417,9 +417,6 @@ Static void pipex_mppe_input (struct mbuf *, struct pipex_sessi
Static void pipex_mppe_output (struct mbuf *, struct pipex_session *, uint16_t);
Static void pipex_ccp_input (struct mbuf *, struct pipex_session *);
Static int pipex_ccp_output (struct pipex_session *, int, int);
-Static inline int pipex_mppe_setkey(struct pipex_mppe *);
-Static inline int pipex_mppe_setoldkey(struct pipex_mppe *, uint16_t);
-Static inline void pipex_mppe_crypt(struct pipex_mppe *, int, u_char *, u_char *);
#endif
Static struct mbuf *adjust_tcp_mss (struct mbuf *, int);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 11:12:02 +0000