diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 10:09:22 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 10:09:29 +0200 |
| commit | 864bfb25b57a6766ea689befa5cf09a4353281ce (patch) | |
| tree | 478941ca6e76b8d77b71f5827a3ce751c46a72b5 /arch/alpha/boot/head.S | |
| parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) | |
| parent | 49717cb40410fe4b563968680ff7c513967504c6 (diff) | |
| download | lwn-864bfb25b57a6766ea689befa5cf09a4353281ce.tar.gz lwn-864bfb25b57a6766ea689befa5cf09a4353281ce.zip | |
Merge branch 'master' into for-next
Merge with 49717cb ("kthread: Document ways of reducing OS jitter due
to per-CPU kthreads") to be able to apply fixup patch on top of it.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch/alpha/boot/head.S')
| -rw-r--r-- | arch/alpha/boot/head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/boot/head.S b/arch/alpha/boot/head.S index b06812bcac83..8efb26686d47 100644 --- a/arch/alpha/boot/head.S +++ b/arch/alpha/boot/head.S @@ -4,6 +4,7 @@ * initial bootloader stuff.. */ +#include <asm/pal.h> .set noreorder .globl __start |