diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
| commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
| tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /arch/blackfin/kernel/fixed_code.S | |
| parent | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/blackfin/kernel/fixed_code.S')
| -rw-r--r-- | arch/blackfin/kernel/fixed_code.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/fixed_code.S b/arch/blackfin/kernel/fixed_code.S index 4b03ba025488..0d2d9e0968c8 100644 --- a/arch/blackfin/kernel/fixed_code.S +++ b/arch/blackfin/kernel/fixed_code.S | |||
| @@ -8,10 +8,12 @@ | |||
| 8 | * BF561 SMP). | 8 | * BF561 SMP). |
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <linux/init.h> | ||
| 11 | #include <linux/unistd.h> | 12 | #include <linux/unistd.h> |
| 12 | #include <asm/entry.h> | 13 | #include <asm/entry.h> |
| 13 | 14 | ||
| 14 | .text | 15 | __INIT |
| 16 | |||
| 15 | ENTRY(_fixed_code_start) | 17 | ENTRY(_fixed_code_start) |
| 16 | 18 | ||
| 17 | .align 16 | 19 | .align 16 |
| @@ -144,3 +146,5 @@ ENTRY(_safe_user_instruction) | |||
| 144 | ENDPROC(_safe_user_instruction) | 146 | ENDPROC(_safe_user_instruction) |
| 145 | 147 | ||
| 146 | ENTRY(_fixed_code_end) | 148 | ENTRY(_fixed_code_end) |
| 149 | |||
| 150 | __FINIT | ||