diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
| commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
| tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /arch/sh/kernel/head_32.S | |
| parent | 0a93a47f042c459f0f46942c3a920e3c81878031 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge commit 'v2.6.30' into for-2.6.31
Diffstat (limited to 'arch/sh/kernel/head_32.S')
| -rw-r--r-- | arch/sh/kernel/head_32.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S index 788605ff708..a78be74b8d3 100644 --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * | 10 | * |
| 11 | * Head.S contains the SH exception handlers and startup code. | 11 | * Head.S contains the SH exception handlers and startup code. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/init.h> | ||
| 13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 14 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
| 15 | 16 | ||
| @@ -40,7 +41,7 @@ ENTRY(empty_zero_page) | |||
| 40 | 1: | 41 | 1: |
| 41 | .skip PAGE_SIZE - empty_zero_page - 1b | 42 | .skip PAGE_SIZE - empty_zero_page - 1b |
| 42 | 43 | ||
| 43 | .section .text.head, "ax" | 44 | __HEAD |
| 44 | 45 | ||
| 45 | /* | 46 | /* |
| 46 | * Condition at the entry of _stext: | 47 | * Condition at the entry of _stext: |