Module Name: src
Committed By: skrll
Date: Sat Jan 25 10:14:29 UTC 2014
Modified Files:
src/sys/compat/linux/arch/powerpc: linux_exec.h
src/sys/dev: kloader.c
src/sys/dev/ic: mfi.c
src/sys/ufs/chfs: chfs_wbuf.c
Log Message:
More alignment spellos
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/linux/arch/powerpc/linux_exec.h
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/kloader.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_wbuf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/powerpc/linux_exec.h
diff -u src/sys/compat/linux/arch/powerpc/linux_exec.h:1.21 src/sys/compat/linux/arch/powerpc/linux_exec.h:1.22
--- src/sys/compat/linux/arch/powerpc/linux_exec.h:1.21 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/arch/powerpc/linux_exec.h Sat Jan 25 10:14:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec.h,v 1.21 2008/04/28 20:23:43 martin Exp $ */
+/* $NetBSD: linux_exec.h,v 1.22 2014/01/25 10:14:29 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
/*
* Size of the auxiliary ELF table. On the PowerPC we need 16 extra bytes
- * in order to force an alignement on a 16 bytes boundary (this is expected
+ * in order to force an alignment on a 16 bytes boundary (this is expected
* by PowerPC GNU ld.so).
*/
#define LINUX_ELF_AUX_ARGSIZ \
Index: src/sys/dev/kloader.c
diff -u src/sys/dev/kloader.c:1.25 src/sys/dev/kloader.c:1.26
--- src/sys/dev/kloader.c:1.25 Fri Nov 19 09:08:26 2010
+++ src/sys/dev/kloader.c Sat Jan 25 10:14:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.c,v 1.25 2010/11/19 09:08:26 dholland Exp $ */
+/* $NetBSD: kloader.c,v 1.26 2014/01/25 10:14:29 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.25 2010/11/19 09:08:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.26 2014/01/25 10:14:29 skrll Exp $");
#include "debug_kloader.h"
@@ -702,7 +702,7 @@ kloader_pagetag_dump(void)
break;
}
if ((p->src & 3) || (p->dst & 3)) {
- printf("data alignement error.\n");
+ printf("data alignment error.\n");
print = TRUE;
}
Index: src/sys/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.50 src/sys/dev/ic/mfi.c:1.51
--- src/sys/dev/ic/mfi.c:1.50 Thu Oct 17 21:24:24 2013
+++ src/sys/dev/ic/mfi.c Sat Jan 25 10:14:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.50 2013/10/17 21:24:24 christos Exp $ */
+/* $NetBSD: mfi.c,v 1.51 2014/01/25 10:14:29 skrll Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.50 2013/10/17 21:24:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.51 2014/01/25 10:14:29 skrll Exp $");
#include "bio.h"
@@ -2940,7 +2940,7 @@ mfi_tbolt_init_desc_pool(struct mfi_soft
uint32_t offset = 0;
uint8_t *addr = MFIMEM_KVA(sc->sc_tbolt_reqmsgpool);
- /* Request Decriptors alignement restrictions */
+ /* Request Decriptors alignment restrictions */
KASSERT(((uintptr_t)addr & 0xFF) == 0);
/* Skip request message pool */
Index: src/sys/ufs/chfs/chfs_wbuf.c
diff -u src/sys/ufs/chfs/chfs_wbuf.c:1.5 src/sys/ufs/chfs/chfs_wbuf.c:1.6
--- src/sys/ufs/chfs/chfs_wbuf.c:1.5 Fri Oct 19 12:44:39 2012
+++ src/sys/ufs/chfs/chfs_wbuf.c Sat Jan 25 10:14:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_wbuf.c,v 1.5 2012/10/19 12:44:39 ttoth Exp $ */
+/* $NetBSD: chfs_wbuf.c,v 1.6 2014/01/25 10:14:29 skrll Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -181,7 +181,7 @@ chfs_write_wbuf(struct chfs_mount* chmp,
/* adjust alignment offset */
if (chmp->chm_wbuf_len != PAGE_MOD(to)) {
chmp->chm_wbuf_len = PAGE_MOD(to);
- /* take care of alignement to next page */
+ /* take care of alignment to next page */
if (!chmp->chm_wbuf_len) {
chmp->chm_wbuf_len += chmp->chm_wbuf_pagesize;
ret = chfs_flush_wbuf(chmp, WBUF_NOPAD);
