Module Name: src
Committed By: ad
Date: Sun Nov 24 13:14:23 UTC 2019
Modified Files:
src/sys/kern: kern_lwp.c kern_turnstile.c
Log Message:
Put section attribute for turnstile0 in the correct place. For LLVM.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_turnstile.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/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.212 src/sys/kern/kern_lwp.c:1.213
--- src/sys/kern/kern_lwp.c:1.212 Sat Nov 23 19:42:52 2019
+++ src/sys/kern/kern_lwp.c Sun Nov 24 13:14:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.212 2019/11/23 19:42:52 ad Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.213 2019/11/24 13:14:23 ad Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -209,7 +209,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.212 2019/11/23 19:42:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.213 2019/11/24 13:14:23 ad Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -259,7 +259,7 @@ SDT_PROBE_DEFINE1(proc, kernel, , lwp__c
SDT_PROBE_DEFINE1(proc, kernel, , lwp__start, "struct lwp *");
SDT_PROBE_DEFINE1(proc, kernel, , lwp__exit, "struct lwp *");
-struct turnstile turnstile0;
+struct turnstile turnstile0 __cacheline_aligned;
struct lwp lwp0 __aligned(MIN_LWP_ALIGNMENT) = {
#ifdef LWP0_CPU_INFO
.l_cpu = LWP0_CPU_INFO,
Index: src/sys/kern/kern_turnstile.c
diff -u src/sys/kern/kern_turnstile.c:1.33 src/sys/kern/kern_turnstile.c:1.34
--- src/sys/kern/kern_turnstile.c:1.33 Thu Nov 21 18:56:55 2019
+++ src/sys/kern/kern_turnstile.c Sun Nov 24 13:14:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_turnstile.c,v 1.33 2019/11/21 18:56:55 ad Exp $ */
+/* $NetBSD: kern_turnstile.c,v 1.34 2019/11/24 13:14:23 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2009, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.33 2019/11/21 18:56:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.34 2019/11/24 13:14:23 ad Exp $");
#include <sys/param.h>
#include <sys/lockdebug.h>
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_turnsti
static tschain_t turnstile_chains[TS_HASH_SIZE] __cacheline_aligned;
static kmutex_t *turnstile_locks[TS_HASH_SIZE] __read_mostly;
pool_cache_t turnstile_cache __read_mostly;
-extern turnstile_t turnstile0 __cacheline_aligned;
+extern turnstile_t turnstile0;
static int turnstile_ctor(void *, void *, int);
