Michal Simek
218540c957
Merge tag 'v2014.10' into master
- Move zynqmp to Kconfig style
- Fix ARM64 mainline code for gicv2 case
diff --git a/arch/arm/include/asm/macro.h
b/arch/arm/include/asm/macro.h
index 541b443..1c8c425 100644 (file)
--- a/arch/arm/include/asm/macro.h
+++ b/arch/arm/include/asm/macro.h
@@ -193,7 +193,7 @@ lr .req x30
0 : wfi
ldr \wreg2, [\xreg1, GICC_AIAR]
str \wreg2, [\xreg1, GICC_AEOIR]
- and \wreg2, \wreg2, #3ff
+ and \wreg2, \wreg2, #0x3ff
cbnz \wreg2, 0b
.endm
#endif
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-10-21 12:05:05 +02:00
..
2014-10-10 09:44:43 -04:00
2014-10-10 09:44:43 -04:00
2014-08-21 12:01:30 -04:00
2014-10-21 12:05:05 +02:00
2014-10-10 09:44:43 -04:00
2014-10-10 09:44:43 -04:00
2014-09-16 12:24:00 -04:00
2013-07-24 09:44:38 -04:00
2014-07-22 07:44:28 -04:00
2014-09-24 18:30:28 -04:00
2013-06-24 19:11:13 -05:00
2012-05-23 17:53:08 -05:00
2014-02-19 11:07:50 -05:00
2012-07-07 14:07:32 +02:00
2014-10-10 09:44:43 -04:00
2013-06-24 19:10:15 -05:00
2013-07-24 09:44:38 -04:00
2014-10-10 09:44:43 -04:00
2014-10-10 09:44:43 -04:00
2013-07-24 09:44:38 -04:00
2013-07-24 09:44:38 -04:00
2012-05-23 17:52:53 -05:00
2013-07-24 09:44:38 -04:00
2013-11-22 17:03:18 -06:00
2012-11-04 11:00:36 -07:00