diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/blackfin/kernel/fixed_code.S | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
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 | ||