Date: Sun, 15 Oct 2006 15:24:58 GMT From: Alexander Leidinger <netchild@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107955 for review Message-ID: <200610151524.k9FFOw7D094676@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107955 Change 107955 by netchild@netchild_magellan on 2006/10/15 15:24:48 Merge some small changes by hand (the automatic resolve is not always ok...) and fix a small nit (whitespace in a string). Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#9 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#9 (text+ko) ==== @@ -23,7 +23,8 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/linuxaio/linux_aio.c,v 1.91 2006/09/25 19:12:31 admin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_aio.c,v 1.1 2006/10/15 14:22:13 +netchild Exp $"); #include "opt_compat.h" @@ -454,7 +455,7 @@ native_aio_module_handle = NULL; printf(LMSG("Unable to link to the native module \"" - NATIVE_AIO_MODULE_NAME "\" correctly.")); + NATIVE_AIO_MODULE_NAME "\".")); return (nerr); } @@ -464,8 +465,8 @@ #define LINK_TO_NATIVE_AIO_MODULE() \ if (link_to_native_aio_module(td)) { \ - printf(LMSG("Please load the correct module \"" \ - NATIVE_AIO_MODULE_NAME "\" correctly " \ + printf(LMSG("Please load the module \"" \ + NATIVE_AIO_MODULE_NAME "\" " \ "to provide FreeBSD " \ "native Asynchronous I/O support.")); \ return (ENOSYS); \ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/linuxaio/linux_aio.h,v 1.8 2006/09/25 19:12:31 admin Exp $ + * $FreeBSD: src/sys/compat/linux/linux_aio.h,v 1.1 2006/10/15 14:22:13 netchild Exp $ */ /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610151524.k9FFOw7D094676>