Module Name: src
Committed By: uebayasi
Date: Tue Aug 25 08:04:31 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/amd64/conf: kern.ldscript kern.ldscript.2MB
kern.ldscript.Xen
Log Message:
Replace COHERENCY_UNIT in ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/conf/kern.ldscript
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/conf/kern.ldscript.2MB
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/conf/kern.ldscript.Xen
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/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.57 src/sys/arch/amd64/amd64/genassym.cf:1.58
--- src/sys/arch/amd64/amd64/genassym.cf:1.57 Sat Jul 11 10:15:33 2015
+++ src/sys/arch/amd64/amd64/genassym.cf Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.57 2015/07/11 10:15:33 kamil Exp $
+# $NetBSD: genassym.cf,v 1.58 2015/08/25 08:04:31 uebayasi Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -373,3 +373,5 @@ define VM_MIN_KERNEL_ADDRESS_HIGH32 (VM_
define RESCHED_KPREEMPT RESCHED_KPREEMPT
define SEL_RPL_MASK SEL_RPL
+
+define COHERENCY_UNIT COHERENCY_UNIT
Index: src/sys/arch/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.13 src/sys/arch/amd64/conf/kern.ldscript:1.14
--- src/sys/arch/amd64/conf/kern.ldscript:1.13 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/amd64/conf/kern.ldscript Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.13 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.14 2015/08/25 08:04:31 uebayasi Exp $ */
ENTRY(_start)
SECTIONS
@@ -28,17 +28,17 @@ SECTIONS
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
Index: src/sys/arch/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.9 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.10
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.9 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.2MB,v 1.9 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.2MB,v 1.10 2015/08/25 08:04:31 uebayasi Exp $ */
ENTRY(_start)
SECTIONS
@@ -28,17 +28,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.8 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.9
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.8 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.9 2015/08/25 08:04:31 uebayasi Exp $ */
ENTRY(_start)
SECTIONS
@@ -22,17 +22,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
