OSDN Git Service

arm64: Fix compilation error while accessing MPIDR_HWID_BITMASK from .S files
authorBhupesh Sharma <bhsharma@redhat.com>
Mon, 19 Feb 2018 06:39:54 +0000 (12:09 +0530)
committerCatalin Marinas <catalin.marinas@arm.com>
Mon, 19 Feb 2018 12:13:29 +0000 (12:13 +0000)
commit04c4927359b1f09310bfee92e7187c9022be3e00
tree33b2d51fc4523d09a2bef6dde6eff84d2a227132
parent91ab883eb21325ad80f3473633f794c78ac87f51
arm64: Fix compilation error while accessing MPIDR_HWID_BITMASK from .S files

Since commit e1a50de37860 (arm64: cputype: Silence Sparse warnings),
compilation of arm64 architecture is broken with the following error
messages:

  AR      arch/arm64/kernel/built-in.o
  arch/arm64/kernel/head.S: Assembler messages:
  arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')'
  arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')'
  arch/arm64/kernel/head.S:677: Error: found 'L', expected: ')'
  arch/arm64/kernel/head.S:677: Error: junk at end of line, first
  unrecognized character is `L'
  arch/arm64/kernel/head.S:677: Error: unexpected characters following
  instruction at operand 2 -- `movz x1,:abs_g1_s:0xff00ffffffUL'
  arch/arm64/kernel/head.S:677: Error: unexpected characters following
  instruction at operand 2 -- `movk x1,:abs_g0_nc:0xff00ffffffUL'

This patch fixes the same by using the UL() macro correctly for
assigning the MPIDR_HWID_BITMASK macro value.

Fixes: e1a50de37860 ("arm64: cputype: Silence Sparse warnings")
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Bhupesh Sharma <bhsharma@redhat.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/include/asm/cputype.h