diff options
| author | alfred <alfred@FreeBSD.org> | 2002-06-29 01:49:22 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2002-06-29 01:49:22 +0000 |
| commit | d92411ce7ab4b178ff55c7f84e10521c0c933e1b (patch) | |
| tree | a34dee7f00c234f53779e4ed49a9950dbca4feff /sys | |
| parent | 9929e0fcf8d2ea7cbd4f814b83c21b888e34d3d8 (diff) | |
| download | FreeBSD-src-d92411ce7ab4b178ff55c7f84e10521c0c933e1b.zip FreeBSD-src-d92411ce7ab4b178ff55c7f84e10521c0c933e1b.tar.gz | |
catch up with mextadd callback taking a void argument instead of a caddr_t.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sk/if_sk.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_cow.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_jumbo.c | 2 | ||||
| -rw-r--r-- | sys/pci/if_sk.c | 4 | ||||
| -rw-r--r-- | sys/sys/jumbo.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 0b0a30c..adb523c 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -149,7 +149,7 @@ static int sk_newbuf (struct sk_if_softc *, struct sk_chain *, struct mbuf *); static int sk_alloc_jumbo_mem (struct sk_if_softc *); static void *sk_jalloc (struct sk_if_softc *); -static void sk_jfree (caddr_t, void *); +static void sk_jfree (void *, void *); static int sk_init_rx_ring (struct sk_if_softc *); static void sk_init_tx_ring (struct sk_if_softc *); static u_int32_t sk_win_read_4 (struct sk_softc *, int); @@ -795,7 +795,7 @@ static void *sk_jalloc(sc_if) * Release a jumbo buffer. */ static void sk_jfree(buf, args) - caddr_t buf; + void *buf; void *args; { struct sk_if_softc *sc_if; diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c index 239e7c5..ed76064 100644 --- a/sys/kern/uipc_cow.c +++ b/sys/kern/uipc_cow.c @@ -85,10 +85,10 @@ extern vm_offset_t sf_base; #define dtosf(x) (&sf_bufs[((uintptr_t)(x) - (uintptr_t)sf_base) >> PAGE_SHIFT]) void sf_buf_free(caddr_t addr, void *args); struct sf_buf *sf_buf_alloc(void); -static void socow_iodone(caddr_t addr, void *args); +static void socow_iodone(void *addr, void *args); static void -socow_iodone(caddr_t addr, void *args) +socow_iodone(void *addr, void *args) { int s; struct sf_buf *sf; diff --git a/sys/kern/uipc_jumbo.c b/sys/kern/uipc_jumbo.c index 4625752..0da5c83 100644 --- a/sys/kern/uipc_jumbo.c +++ b/sys/kern/uipc_jumbo.c @@ -140,7 +140,7 @@ jumbo_vm_init(void) } void -jumbo_freem(caddr_t addr, void *args) +jumbo_freem(void *addr, void *args) { vm_page_t frame; diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index 0b0a30c..adb523c 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -149,7 +149,7 @@ static int sk_newbuf (struct sk_if_softc *, struct sk_chain *, struct mbuf *); static int sk_alloc_jumbo_mem (struct sk_if_softc *); static void *sk_jalloc (struct sk_if_softc *); -static void sk_jfree (caddr_t, void *); +static void sk_jfree (void *, void *); static int sk_init_rx_ring (struct sk_if_softc *); static void sk_init_tx_ring (struct sk_if_softc *); static u_int32_t sk_win_read_4 (struct sk_softc *, int); @@ -795,7 +795,7 @@ static void *sk_jalloc(sc_if) * Release a jumbo buffer. */ static void sk_jfree(buf, args) - caddr_t buf; + void *buf; void *args; { struct sk_if_softc *sc_if; diff --git a/sys/sys/jumbo.h b/sys/sys/jumbo.h index f2d7135..90f2ab4 100644 --- a/sys/sys/jumbo.h +++ b/sys/sys/jumbo.h @@ -53,7 +53,7 @@ jumbo_phys_to_kva(vm_offset_t pa) } int jumbo_vm_init(void); -void jumbo_freem(caddr_t addr, void *args); +void jumbo_freem(void *addr, void *args); vm_page_t jumbo_pg_alloc(void); void jumbo_pg_free(vm_offset_t addr); void jumbo_pg_steal(vm_page_t pg); |
