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

[xen staging] xen/arm: Fix compilation error when early printk is enabled



commit 24114840ea4f82b6958ba0d7ac5e4cec44aafe11
Author:     Michal Orzel <michal.orzel@xxxxxxx>
AuthorDate: Thu Jan 21 10:30:41 2021 +0100
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Thu Jan 21 13:41:21 2021 -0800

    xen/arm: Fix compilation error when early printk is enabled
    
    Fix compilation error when enabling early printk, introduced
    by commit aa4b9d1ee6538b5cbe218d4d3fcdf9548130a063:
    ```
    debug.S: Assembler messages:
    debug.S:31: Error: constant expression expected at operand 2 -- `ldr 
x15,=((0x00400000+(0)*PAGE_SIZE)+(0x1c090000&~PAGE_MASK))`
    debug.S:38: Error: constant expression expected at operand 2 -- `ldr 
x15,=((0x00400000+(0)*PAGE_SIZE)+(0x1c090000&~PAGE_MASK))`
    ```
    
    The fix is to include header <xen/page-size.h> which now contains
    definitions for page/size/mask etc.
    
    Fixes: aa4b9d1ee653 ("include: don't use asm/page.h from common headers")
    Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
    Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>
    Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
 xen/include/asm-arm/early_printk.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xen/include/asm-arm/early_printk.h 
b/xen/include/asm-arm/early_printk.h
index d5485decfa..8dc911cf48 100644
--- a/xen/include/asm-arm/early_printk.h
+++ b/xen/include/asm-arm/early_printk.h
@@ -10,6 +10,7 @@
 #ifndef __ARM_EARLY_PRINTK_H__
 #define __ARM_EARLY_PRINTK_H__
 
+#include <xen/page-size.h>
 
 #ifdef 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®.