d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: Don't include KERNBASE in genassym, it's unnecessary

Browse Source 
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.
This commit is contained in:
Justin Hibbits 2018-11-28 16:00:52 +00:00
parent 43cf589ced
commit 8f69e36d87
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=341148
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/powerpc/aim/locore32.S
View File

@ -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 */

1
sys/powerpc/aim/locore64.S
View File

@ -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

2
sys/powerpc/include/vmparam.h
View File

@ -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)

1
sys/powerpc/powerpc/genassym.c
View File

@ -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);