diff mbox series

[5/6] parisc: Move pdc_result struct to firmware.c

Message ID 20221217220428.383330-5-deller@gmx.de (mailing list archive)
State Accepted, archived
Headers show
Series [1/6] parisc: Drop PMD_SHIFT from calculation in pgtable.h | expand

Commit Message

Helge Deller Dec. 17, 2022, 10:04 p.m. UTC
Signed-off-by: Helge Deller <deller@gmx.de>
---
 arch/parisc/kernel/firmware.c |  4 ++--
 arch/parisc/kernel/real2.S    | 17 ++---------------
 2 files changed, 4 insertions(+), 17 deletions(-)

--
2.38.1
diff mbox series

Patch

diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index 5bccf0025fbd..9d7516376fbf 100644
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -74,8 +74,8 @@ 
 static DEFINE_SPINLOCK(pdc_lock);
 #endif

-extern unsigned long pdc_result[NUM_PDC_RESULT];
-extern unsigned long pdc_result2[NUM_PDC_RESULT];
+unsigned long pdc_result[NUM_PDC_RESULT]  __aligned(8);
+unsigned long pdc_result2[NUM_PDC_RESULT] __aligned(8);

 #ifdef CONFIG_64BIT
 #define WIDE_FIRMWARE 0x1
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S
index 2b16d8d6598f..4dc12c4c0980 100644
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
@@ -15,28 +15,15 @@ 

 #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
-	.align	64
+	__PAGE_ALIGNED_BSS
 real_stack:
-real32_stack:
 real64_stack:
 	.block	8192

 #define N_SAVED_REGS 9
-
+	.section	.bss
 save_cr_space:
 	.block	REG_SZ * N_SAVED_REGS
 save_cr_end: