From ea861abf2ae84b93075ddcb0b3abf37e8db5f9b1 Mon Sep 17 00:00:00 2001 From: jkim Date: Mon, 17 Jan 2011 22:58:28 +0000 Subject: Add reader/writer lock around mem_range_attr_get() and mem_range_attr_set(). Compile sys/dev/mem/memutil.c for all supported platforms and remove now unnecessary dev_mem_md_init(). Consistently define mem_range_softc from mem.c for all platforms. Add missing #include guards for machine/memdev.h and sys/memrange.h. Clean up some nearby style(9) nits. MFC after: 1 month --- sys/arm/arm/mem.c | 2 ++ sys/arm/include/memdev.h | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'sys/arm') diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c index a77ad90..57fd2eb 100644 --- a/sys/arm/arm/mem.c +++ b/sys/arm/arm/mem.c @@ -70,6 +70,8 @@ __FBSDID("$FreeBSD$"); */ MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +struct mem_range_softc mem_range_softc; + /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) diff --git a/sys/arm/include/memdev.h b/sys/arm/include/memdev.h index d32432e..3ce0f38 100644 --- a/sys/arm/include/memdev.h +++ b/sys/arm/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; d_mmap_t memmmap; #define memioctl (d_ioctl_t *)NULL -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ -- cgit v1.1