Module Name: src
Committed By: mhitch
Date: Thu Sep 10 22:27:11 UTC 2009
Modified Files:
src/sys/arch/alpha/alpha: pmap.c
Log Message:
Alpha will size the mutex structure in pmap_tlb_shootdown_q to 16 bytes.
Change the command and pad accordingly; now pmap_tlb_shootdown_q entries
really are cache-aligned.
To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/arch/alpha/alpha/pmap.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/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.241 src/sys/arch/alpha/alpha/pmap.c:1.242
--- src/sys/arch/alpha/alpha/pmap.c:1.241 Thu Sep 10 21:36:39 2009
+++ src/sys/arch/alpha/alpha/pmap.c Thu Sep 10 22:27:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.241 2009/09/10 21:36:39 mhitch Exp $ */
+/* $NetBSD: pmap.c,v 1.242 2009/09/10 22:27:11 mhitch Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.241 2009/09/10 21:36:39 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.242 2009/09/10 22:27:11 mhitch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -422,11 +422,11 @@
static struct pmap_tlb_shootdown_q {
TAILQ_HEAD(, pmap_tlb_shootdown_job) pq_head; /* queue 16b */
- kmutex_t pq_lock; /* spin lock on queue 12b */
+ kmutex_t pq_lock; /* spin lock on queue 16b */
int pq_pte; /* aggregate PTE bits 4b */
int pq_count; /* number of pending requests 4b */
int pq_tbia; /* pending global flush 4b */
- uint8_t pq_pad[64-16-12-4-4-4]; /* pad to 64 bytes */
+ uint8_t pq_pad[64-16-16-4-4-4]; /* pad to 64 bytes */
} pmap_tlb_shootdown_q[ALPHA_MAXPROCS] __aligned(CACHE_LINE_SIZE);
/* If we have more pending jobs than this, we just nail the whole TLB. */
