diff options
| author |   Will Deacon <will.deacon@arm.com> | 2013-11-06 19:31:24 +0000 |
|---|---|---|
| committer |   Catalin Marinas <catalin.marinas@arm.com> | 2013-12-19 17:43:07 +0000 |
| commit | 4da7a56c59f28e27e8dcff61b5d7b05f6e203606 (patch) | |
| tree | 575af2e3ddffa656f26daa7138083b5a0954a72c | |
| parent | arm64: use generic strnlen_user and strncpy_from_user functions (diff) | |
| download | linux-dev-4da7a56c59f28e27e8dcff61b5d7b05f6e203606.tar.xz linux-dev-4da7a56c59f28e27e8dcff61b5d7b05f6e203606.zip | |
arm64: futex: ensure .fixup entries are sufficiently aligned
AArch64 instructions must be 4-byte aligned, so make sure this is true
for the futex .fixup section.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm64/include/asm/futex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h index c582fa316366..78cc3aba5d69 100644 --- a/arch/arm64/include/asm/futex.h +++ b/arch/arm64/include/asm/futex.h @@ -30,6 +30,7 @@ " cbnz %w3, 1b\n" \ "3:\n" \ " .pushsection .fixup,\"ax\"\n" \ +" .align 2\n" \ "4: mov %w0, %w5\n" \ " b 3b\n" \ " .popsection\n" \ |