diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-11 14:50:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-11 14:50:13 +0100 |
| commit | 98f07013149d4be18ff16cfc5b43218f3a70afd6 (patch) | |
| tree | ea0d098749e99394128b9abb22fd36f5a767532e /arch/arm/kernel/kprobes-test.h | |
| parent | 53f1d9afb4c85c4d6a107420188d84ddf76ebbc0 (diff) | |
| parent | 98775936d33c1678f49300dfe89e37771cbe3e69 (diff) | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/kernel/kprobes-test.h')
| -rw-r--r-- | arch/arm/kernel/kprobes-test.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/kprobes-test.h b/arch/arm/kernel/kprobes-test.h index e28a869b1ae4..eecc90a0fd91 100644 --- a/arch/arm/kernel/kprobes-test.h +++ b/arch/arm/kernel/kprobes-test.h @@ -115,7 +115,7 @@ struct test_arg_end { /* multiple strings to be concatenated. */ \ ".ascii "#title" \n\t" \ ".byte 0 \n\t" \ - ".align 2 \n\t" + ".align 2, 0 \n\t" #define TEST_ARG_REG(reg, val) \ ".byte "__stringify(ARG_TYPE_REG)" \n\t" \ |