[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] xen/arm: Fix arm32 build failure when early printk is enabled



commit b2b3d40f9a030ba79ce3abadccb5da485af33589
Author:     Michal Orzel <michal.orzel@xxxxxxx>
AuthorDate: Wed Feb 28 11:35:55 2024 +0100
Commit:     Julien Grall <jgrall@xxxxxxxxxx>
CommitDate: Wed Feb 28 11:56:47 2024 +0000

    xen/arm: Fix arm32 build failure when early printk is enabled
    
    Commit 0441c3acc7e9 forgot to rename FIXMAP_CONSOLE to FIX_CONSOLE in
    TEMPORARY_EARLY_UART_VIRTUAL_ADDRESS macro. This results in a build
    failure on arm32, when early printk is enabled:
    arch/arm/arm32/mmu/head.S:311: Error: invalid operands (*UND* and *ABS* 
sections) for `*'
    
    Fixes: 0441c3acc7e9 ("xen/arm: fixmap: Rename the fixmap slots to follow 
the x86 convention")
    Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
    Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
---
 xen/arch/arm/include/asm/early_printk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/arm/include/asm/early_printk.h 
b/xen/arch/arm/include/asm/early_printk.h
index f444e89a86..46a5e562dd 100644
--- a/xen/arch/arm/include/asm/early_printk.h
+++ b/xen/arch/arm/include/asm/early_printk.h
@@ -20,7 +20,7 @@
     (FIXMAP_ADDR(FIX_CONSOLE) + (CONFIG_EARLY_UART_BASE_ADDRESS & ~PAGE_MASK))
 
 #define TEMPORARY_EARLY_UART_VIRTUAL_ADDRESS \
-    (TEMPORARY_FIXMAP_ADDR(FIXMAP_CONSOLE) + (CONFIG_EARLY_UART_BASE_ADDRESS & 
~PAGE_MASK))
+    (TEMPORARY_FIXMAP_ADDR(FIX_CONSOLE) + (CONFIG_EARLY_UART_BASE_ADDRESS & 
~PAGE_MASK))
 
 #endif /* !CONFIG_EARLY_PRINTK */
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.