diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-20 09:48:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-20 09:48:10 -0700 |
| commit | 198190a188b9cefff22b51c0be5f0f70b6f9b618 (patch) | |
| tree | 333216304026afaf12bd765f814014ceb6673e45 /arch/arm64/include/asm/linkage.h | |
| parent | 31fd84b95eb211d5db460a1dda85e004800a7b52 (diff) | |
| parent | aeed41a9371ee02257b608eb06a9058507a7d0f4 (diff) | |
| download | kernel_replicant_linux-198190a188b9cefff22b51c0be5f0f70b6f9b618.tar.gz kernel_replicant_linux-198190a188b9cefff22b51c0be5f0f70b6f9b618.tar.bz2 kernel_replicant_linux-198190a188b9cefff22b51c0be5f0f70b6f9b618.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 fixes from Catalin Marinas:
"Main changes:
- AArch64 Linux compilation fixes following 3.7-rc1 changes
(MODULES_USE_ELF_RELA, update_vsyscall() prototype)
- Unnecessary register setting in start_thread() (thanks to Al Viro)
- ptrace fixes"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
arm64: fix alignment padding in assembly code
arm64: ptrace: use HW_BREAKPOINT_EMPTY type for disabled breakpoints
arm64: ptrace: make structure padding explicit for debug registers
arm64: No need to set the x0-x2 registers in start_thread()
arm64: Ignore memory blocks below PHYS_OFFSET
arm64: Fix the update_vsyscall() prototype
arm64: Select MODULES_USE_ELF_RELA
arm64: Remove duplicate inclusion of mmu_context.h in smp.c
Diffstat (limited to 'arch/arm64/include/asm/linkage.h')
| -rw-r--r-- | arch/arm64/include/asm/linkage.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h new file mode 100644 index 000000000000..636c1bced7d4 --- /dev/null +++ b/arch/arm64/include/asm/linkage.h @@ -0,0 +1,7 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#define __ALIGN .align 4 +#define __ALIGN_STR ".align 4" + +#endif |