Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c86cb82 authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

parisc: move pdc_result to real2.S

parent 1e22166c

arch/parisc/kernel/asm-offsets.c

+3 −0
Original line number Diff line number Diff line
@@ -290,5 +290,8 @@ int main(void) 
	DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));

	DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));

	DEFINE(EXCDATA_ADDR, offsetof(struct exception_data, fault_addr));

	BLANK();

	DEFINE(ASM_PDC_RESULT_SIZE, NUM_PDC_RESULT * sizeof(unsigned long));

	BLANK();

	return 0;

}

arch/parisc/kernel/firmware.c

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ 
#include <asm/processor.h>	/* for boot_cpu_data */



static DEFINE_SPINLOCK(pdc_lock);

static unsigned long pdc_result[32] __attribute__ ((aligned (8)));

static unsigned long pdc_result2[32] __attribute__ ((aligned (8)));

extern unsigned long pdc_result[NUM_PDC_RESULT];

extern unsigned long pdc_result2[NUM_PDC_RESULT];



#ifdef CONFIG_64BIT

#define WIDE_FIRMWARE 0x1

arch/parisc/kernel/real2.S

+12 −0
Original line number Diff line number Diff line
@@ -8,12 +8,24 @@ 
 *

 */



#include <asm/pdc.h>

#include <asm/psw.h>

#include <asm/assembly.h>

#include <asm/asm-offsets.h>



#include <linux/linkage.h>





	.section	.bss



	.export pdc_result

	.export pdc_result2

	.align 8

pdc_result:

	.block	ASM_PDC_RESULT_SIZE

pdc_result2:

	.block	ASM_PDC_RESULT_SIZE



	.export real_stack

	.export real32_stack

	.export real64_stack

include/asm-parisc/pdc.h

+3 −0
Original line number Diff line number Diff line
@@ -332,6 +332,9 @@ 
#define BOOT_CONSOLE_SPA_OFFSET  0x3c4

#define BOOT_CONSOLE_PATH_OFFSET 0x3a8



/* size of the pdc_result buffer for firmware.c */

#define NUM_PDC_RESULT	32



#if !defined(__ASSEMBLY__)

#ifdef __KERNEL__