@@ -134,7 +134,7 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c
$(CC) $(filter-out -flto,$(c_flags)) -S -o $@ $<
xen.lds: xen.lds.S
- $(CPP) -P $(a_flags) -MQ $@ -o $@ $<
+ $(CPP) -P $(a_flags) -D__LINKER__ -MQ $@ -o $@ $<
dtb.o: $(patsubst "%",%,$(CONFIG_DTB_FILE))
@@ -1,4 +1,3 @@
-#include <asm/asm_defns.h>
#include <asm/sysregs.h>
#include <asm/regs.h>
#include <asm/alternative.h>
@@ -18,7 +18,6 @@
*/
#include <asm/page.h>
-#include <asm/asm_defns.h>
#include <asm/early_printk.h>
#define ZIMAGE_MAGIC_NUMBER 0x016f2818
@@ -17,7 +17,6 @@
* GNU General Public License for more details.
*/
-#include <asm/asm_defns.h>
#include <asm/arm32/processor.h>
#include <asm/sysregs.h>
@@ -17,7 +17,6 @@
* GNU General Public License for more details.
*/
-#include <asm/asm_defns.h>
#include <asm/cadence-uart.h>
/*
@@ -16,8 +16,6 @@
* GNU General Public License for more details.
*/
-#include <asm/asm_defns.h>
-
/*
* PL011 UART initialization
* xb: register which containts the UART base address
@@ -1,6 +1,4 @@
-#include <asm/asm_defns.h>
#include <asm/current.h>
-#include <asm/macros.h>
#include <asm/regs.h>
#include <asm/alternative.h>
#include <asm/smccc.h>
@@ -21,11 +21,9 @@
*/
#include <asm/page.h>
-#include <asm/asm_defns.h>
#include <asm/early_printk.h>
#include <efi/efierr.h>
#include <asm/arm64/efibind.h>
-#include <asm/arm64/macros.h>
#define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */
#define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */
@@ -13,9 +13,6 @@
* GNU General Public License for more details.
*/
-#include <asm/asm_defns.h>
-#include <asm/macros.h>
-
/*
* void __arm_smccc_1_0_smc(register_t a0, register_t a1, register_t a2,
* register_t a3, register_t a4, register_t a5,
@@ -69,6 +69,7 @@
#endif
#include <xen/const.h>
+#include <xen/page-size.h>
/*
* Common ARM32 and ARM64 layout:
@@ -190,6 +191,11 @@ extern unsigned long frametable_virt_end;
#define watchdog_disable() ((void)0)
#define watchdog_enable() ((void)0)
+#if defined(__ASSEMBLY__) && !defined(__LINKER__)
+#include <asm/asm_defns.h>
+#include <asm/macros.h>
+#endif
+
#endif /* __ARM_CONFIG_H__ */
/*
* Local variables: