Commit 1236cd2b authored Dec 29, 2018 by Shaokun Zhang Committed by Will Deacon Jan 03, 2019

arm64: smp: Fix compilation error



For arm64: updates for 4.21, there is a compilation error:
arch/arm64/kernel/head.S: Assembler messages:
arch/arm64/kernel/head.S:824: Error: missing ')'
arch/arm64/kernel/head.S:824: Error: missing ')'
arch/arm64/kernel/head.S:824: Error: missing ')'
arch/arm64/kernel/head.S:824: Error: unexpected characters following instruction at operand 2 -- `mov x2,#(2)|(2U<<(8))'
scripts/Makefile.build:391: recipe for target 'arch/arm64/kernel/head.o' failed
make[1]: *** [arch/arm64/kernel/head.o] Error 1
GCC version is gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.10) 5.4.0 20160609

Let's fix it using the UL() macro.

Fixes: 66f16a24 ("arm64: smp: Rework early feature mismatched detection")
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
[will: consistent use of UL() for all shifts in asm constants]
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 12f799c8

arch/arm64/include/asm/smp.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,11 @@
		#ifndef __ASM_SMP_H
		#define __ASM_SMP_H

		#include <linux/const.h>

		/* Values for secondary_data.status */
		#define CPU_STUCK_REASON_SHIFT (8)
		#define CPU_BOOT_STATUS_MASK ((1U << CPU_STUCK_REASON_SHIFT) - 1)
		#define CPU_BOOT_STATUS_MASK ((UL(1) << CPU_STUCK_REASON_SHIFT) - 1)

		#define CPU_MMU_OFF (-1)
		#define CPU_BOOT_SUCCESS (0)
		@@ -29,8 +31,8 @@
		/* Fatal system error detected by secondary CPU, crash the system */
		#define CPU_PANIC_KERNEL (3)

		#define CPU_STUCK_REASON_52_BIT_VA (1U << CPU_STUCK_REASON_SHIFT)
		#define CPU_STUCK_REASON_NO_GRAN (2U << CPU_STUCK_REASON_SHIFT)
		#define CPU_STUCK_REASON_52_BIT_VA (UL(1) << CPU_STUCK_REASON_SHIFT)
		#define CPU_STUCK_REASON_NO_GRAN (UL(2) << CPU_STUCK_REASON_SHIFT)

		#ifndef __ASSEMBLY__