svn commit: r341148 - in head/sys/powerpc: aim include powerpc
Justin Hibbits
jhibbits at FreeBSD.org
Wed Nov 28 16:00:54 UTC 2018
Author: jhibbits
Date: Wed Nov 28 16:00:52 2018
New Revision: 341148
URL: https://svnweb.freebsd.org/changeset/base/341148
Log:
powerpc: Don't include KERNBASE in genassym, it's unnecessary
A related future change, which changes KERNBASE for Book-E for some reason
causes a "KERNBASE redefined" error with assym.inc, even though it only changed
the value of KERNBASE and nothing else. Since machine/vmparam.h is already
included in booke/locore.S, and the requisite guards are already in place for
properly handling KERNBASE in vmparam.h, just remove it from genassym, and
include vmparam.h in the AIM locore files.
Modified:
head/sys/powerpc/aim/locore32.S
head/sys/powerpc/aim/locore64.S
head/sys/powerpc/include/vmparam.h
head/sys/powerpc/powerpc/genassym.c
Modified: head/sys/powerpc/aim/locore32.S
==============================================================================
--- head/sys/powerpc/aim/locore32.S Wed Nov 28 15:34:46 2018 (r341147)
+++ head/sys/powerpc/aim/locore32.S Wed Nov 28 16:00:52 2018 (r341148)
@@ -33,6 +33,7 @@
#include <machine/param.h>
#include <machine/spr.h>
#include <machine/asm.h>
+#include <machine/vmparam.h>
#include "opt_platform.h"
/* Locate the per-CPU data structure */
Modified: head/sys/powerpc/aim/locore64.S
==============================================================================
--- head/sys/powerpc/aim/locore64.S Wed Nov 28 15:34:46 2018 (r341147)
+++ head/sys/powerpc/aim/locore64.S Wed Nov 28 16:00:52 2018 (r341148)
@@ -35,6 +35,7 @@
#include <machine/param.h>
#include <machine/spr.h>
#include <machine/asm.h>
+#include <machine/vmparam.h>
#ifdef _CALL_ELF
.abiversion _CALL_ELF
Modified: head/sys/powerpc/include/vmparam.h
==============================================================================
--- head/sys/powerpc/include/vmparam.h Wed Nov 28 15:34:46 2018 (r341147)
+++ head/sys/powerpc/include/vmparam.h Wed Nov 28 16:00:52 2018 (r341148)
@@ -117,7 +117,7 @@
#endif
#ifdef AIM
-#define KERNBASE 0x00100100UL /* start of kernel virtual */
+#define KERNBASE 0x00100100 /* start of kernel virtual */
#ifndef __powerpc64__
#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)KERNEL_SR << ADDR_SR_SHFT)
Modified: head/sys/powerpc/powerpc/genassym.c
==============================================================================
--- head/sys/powerpc/powerpc/genassym.c Wed Nov 28 15:34:46 2018 (r341147)
+++ head/sys/powerpc/powerpc/genassym.c Wed Nov 28 16:00:52 2018 (r341148)
@@ -225,7 +225,6 @@ ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED);
ASSYM(SF_UC, offsetof(struct sigframe, sf_uc));
-ASSYM(KERNBASE, KERNBASE);
ASSYM(DMAP_BASE_ADDRESS, DMAP_BASE_ADDRESS);
ASSYM(MAXCOMLEN, MAXCOMLEN);
More information about the svn-src-all
mailing list