redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

powerpc/prom_init: Move ibm_arch_vec to __prombss 

Make the existing initialized definition constant and copy
it to a __prombss copy

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
hifive-unleashed-5.1
Benjamin Herrenschmidt 2018-10-15 13:49:55 +11:00 committed by Michael Ellerman
parent c886087cae
commit a614f52e75
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/kernel/prom_init.c
View File

@ -788,7 +788,7 @@ struct ibm_arch_vec {
struct option_vector6 vec6;
} __packed;
struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
static const struct ibm_arch_vec ibm_architecture_vec_template = {
.pvrs = {
{
.mask = cpu_to_be32(0xfffe0000), /* POWER5/POWER5+ */
@ -926,6 +926,8 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
},
};
static struct ibm_arch_vec __prombss ibm_architecture_vec ____cacheline_aligned;
/* Old method - ELF header with PT_NOTE sections only works on BE */
#ifdef __BIG_ENDIAN__
static const struct fake_elf {
@ -1135,6 +1137,10 @@ static void __init prom_check_platform_support(void)
};
int prop_len = prom_getproplen(prom.chosen,
"ibm,arch-vec-5-platform-support");
/* First copy the architecture vec template */
ibm_architecture_vec = ibm_architecture_vec_template;
if (prop_len > 1) {
int i;
u8 vec[8];