diff options
author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/sh/kernel/init_task.c | |
parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/sh/kernel/init_task.c')
-rw-r--r-- | arch/sh/kernel/init_task.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c index 4b449c4a6bad..f9bcc606127e 100644 --- a/arch/sh/kernel/init_task.c +++ b/arch/sh/kernel/init_task.c | |||
@@ -11,8 +11,8 @@ static struct fs_struct init_fs = INIT_FS; | |||
11 | static struct files_struct init_files = INIT_FILES; | 11 | static struct files_struct init_files = INIT_FILES; |
12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
14 | struct pt_regs fake_swapper_regs; | ||
14 | struct mm_struct init_mm = INIT_MM(init_mm); | 15 | struct mm_struct init_mm = INIT_MM(init_mm); |
15 | |||
16 | EXPORT_SYMBOL(init_mm); | 16 | EXPORT_SYMBOL(init_mm); |
17 | 17 | ||
18 | /* | 18 | /* |
@@ -22,7 +22,7 @@ EXPORT_SYMBOL(init_mm); | |||
22 | * way process stacks are handled. This is done by having a special | 22 | * way process stacks are handled. This is done by having a special |
23 | * "init_task" linker map entry.. | 23 | * "init_task" linker map entry.. |
24 | */ | 24 | */ |
25 | union thread_union init_thread_union | 25 | union thread_union init_thread_union |
26 | __attribute__((__section__(".data.init_task"))) = | 26 | __attribute__((__section__(".data.init_task"))) = |
27 | { INIT_THREAD_INFO(init_task) }; | 27 | { INIT_THREAD_INFO(init_task) }; |
28 | 28 | ||