diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /arch/i386/kernel/init_task.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'arch/i386/kernel/init_task.c')
| -rw-r--r-- | arch/i386/kernel/init_task.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/i386/kernel/init_task.c b/arch/i386/kernel/init_task.c index d3b395732..0faa696a4 100644 --- a/arch/i386/kernel/init_task.c +++ b/arch/i386/kernel/init_task.c @@ -10,7 +10,7 @@ static struct fs_struct init_fs = INIT_FS; static struct file * init_fd_array[NR_OPEN] = { NULL, }; static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS; -struct mm_struct init_mm = INIT_MM; +struct mm_struct init_mm = INIT_MM(init_mm); /* * Initial task structure. @@ -20,5 +20,6 @@ struct mm_struct init_mm = INIT_MM; * "init_task" linker map entry.. */ union task_union init_task_union - __attribute__((__section__(".data.init_task"))) = { INIT_TASK }; + __attribute__((__section__(".data.init_task"))) = + { INIT_TASK(init_task_union.task) }; |