tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

parisc: move pdc_result to real2.S

authored by

Kyle McMartin and committed by
Kyle McMartin 6c86cb82 1e22166c

+20 -2
+3
arch/parisc/kernel/asm-offsets.c
··· 290 290 DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip)); 291 291 DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space)); 292 292 DEFINE(EXCDATA_ADDR, offsetof(struct exception_data, fault_addr)); 293 + BLANK(); 294 + DEFINE(ASM_PDC_RESULT_SIZE, NUM_PDC_RESULT * sizeof(unsigned long)); 295 + BLANK(); 293 296 return 0; 294 297 }
+2 -2
arch/parisc/kernel/firmware.c
··· 71 71 #include <asm/processor.h> /* for boot_cpu_data */ 72 72 73 73 static DEFINE_SPINLOCK(pdc_lock); 74 - static unsigned long pdc_result[32] __attribute__ ((aligned (8))); 75 - static unsigned long pdc_result2[32] __attribute__ ((aligned (8))); 74 + extern unsigned long pdc_result[NUM_PDC_RESULT]; 75 + extern unsigned long pdc_result2[NUM_PDC_RESULT]; 76 76 77 77 #ifdef CONFIG_64BIT 78 78 #define WIDE_FIRMWARE 0x1
+12
arch/parisc/kernel/real2.S
··· 8 8 * 9 9 */ 10 10 11 + #include <asm/pdc.h> 11 12 #include <asm/psw.h> 12 13 #include <asm/assembly.h> 14 + #include <asm/asm-offsets.h> 13 15 14 16 #include <linux/linkage.h> 15 17 18 + 16 19 .section .bss 20 + 21 + .export pdc_result 22 + .export pdc_result2 23 + .align 8 24 + pdc_result: 25 + .block ASM_PDC_RESULT_SIZE 26 + pdc_result2: 27 + .block ASM_PDC_RESULT_SIZE 28 + 17 29 .export real_stack 18 30 .export real32_stack 19 31 .export real64_stack
+3
include/asm-parisc/pdc.h
··· 332 332 #define BOOT_CONSOLE_SPA_OFFSET 0x3c4 333 333 #define BOOT_CONSOLE_PATH_OFFSET 0x3a8 334 334 335 + /* size of the pdc_result buffer for firmware.c */ 336 + #define NUM_PDC_RESULT 32 337 + 335 338 #if !defined(__ASSEMBLY__) 336 339 #ifdef __KERNEL__ 337 340