ARM: rockchip: fix build without pie

diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c
index 794b8b58b0b2302636b67ad0b128859ef493dee1..97d37532b5db4e7e03a43283e518ad354b1af2c6 100755 (executable)
--- a/arch/arm/mach-rockchip/common.c
+++ b/arch/arm/mach-rockchip/common.c
@@ -156,6 +156,7 @@ void *rockchip_sram_virt = NULL;
 size_t rockchip_sram_size = 0;
 char *rockchip_sram_stack = NULL;
 
+#ifdef CONFIG_PIE
 int __init rockchip_pie_init(void)
 {
        struct device_node *np;
@@ -173,6 +174,7 @@ int __init rockchip_pie_init(void)
 
        return 0;
 }
+#endif
 
 static bool is_panic = false;
 

diff --git a/arch/arm/mach-rockchip/sram.h b/arch/arm/mach-rockchip/sram.h
index d4c7d74379214c990dc5618015f4c33d8f3812b5..91149ae23097f5e9ef5996d2fbfd330c175fd87a 100644 (file)
--- a/arch/arm/mach-rockchip/sram.h
+++ b/arch/arm/mach-rockchip/sram.h
@@ -44,6 +44,11 @@ extern char __pie_data(rk3188) __pie_rk3188_sram_stack[1024];
 #define __sramlocalfunc RK_PIE
 
 extern void call_with_stack(void (*fn)(void *), void *arg, void *sp);
+
+#ifdef CONFIG_PIE
 extern int __init rockchip_pie_init(void);
+#else
+static inline int rockchip_pie_init(void) { return -1; }
+#endif
 
 #endif