diff options
author | Chris Zankel <chris@zankel.net> | 2007-08-04 12:27:30 -0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2007-08-27 16:53:12 -0400 |
commit | 73089cbfdf0c69e061a4fa90d614679e630c6727 (patch) | |
tree | 7d824a51511a5ae7bf9fe3242ddc6b102db7ea38 /arch/xtensa | |
parent | b2444d34a0e727a80fee4b725bc5ecb9d0f206f0 (diff) |
[XTENSA] Move pre-initialized structures to init_task.c
Move all initialization structures for the initial task to it's own file.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r-- | arch/xtensa/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/init_task.c | 38 | ||||
-rw-r--r-- | arch/xtensa/kernel/process.c | 15 |
3 files changed, 40 insertions, 15 deletions
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index 71f733c4f66d..0e3ac686c175 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile | |||
@@ -7,7 +7,7 @@ extra-y := head.o vmlinux.lds | |||
7 | 7 | ||
8 | obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o \ | 8 | obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o \ |
9 | setup.o signal.o syscall.o time.o traps.o vectors.o platform.o \ | 9 | setup.o signal.o syscall.o time.o traps.o vectors.o platform.o \ |
10 | pci-dma.o | 10 | pci-dma.o init_task.o |
11 | 11 | ||
12 | ## windowspill.o | 12 | ## windowspill.o |
13 | 13 | ||
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c new file mode 100644 index 000000000000..021b4f46ff94 --- /dev/null +++ b/arch/xtensa/kernel/init_task.c | |||
@@ -0,0 +1,38 @@ | |||
1 | /* | ||
2 | * arch/xtensa/kernel/init_task.c | ||
3 | * | ||
4 | * Xtensa Processor version. | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | * | ||
10 | * Copyright (C) 2007 Tensilica Inc. | ||
11 | * | ||
12 | * Chris Zankel <chris@zankel.net> | ||
13 | */ | ||
14 | |||
15 | #include <linux/mm.h> | ||
16 | #include <linux/fs.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/init_task.h> | ||
19 | #include <linux/module.h> | ||
20 | #include <linux/mqueue.h> | ||
21 | |||
22 | #include <asm/uaccess.h> | ||
23 | |||
24 | static struct fs_struct init_fs = INIT_FS; | ||
25 | static struct files_struct init_files = INIT_FILES; | ||
26 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | ||
27 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | ||
28 | struct mm_struct init_mm = INIT_MM(init_mm); | ||
29 | |||
30 | EXPORT_SYMBOL(init_mm); | ||
31 | |||
32 | union thread_union init_thread_union | ||
33 | __attribute__((__section__(".data.init_task"))) = | ||
34 | { INIT_THREAD_INFO(init_task) }; | ||
35 | |||
36 | struct task_struct init_task = INIT_TASK(init_task); | ||
37 | |||
38 | EXPORT_SYMBOL(init_task); | ||
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index ce758bab95b1..f53d7bd9dfb2 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/init_task.h> | 30 | #include <linux/init_task.h> |
31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
32 | #include <linux/mqueue.h> | 32 | #include <linux/mqueue.h> |
33 | #include <linux/fs.h> | ||
33 | 34 | ||
34 | #include <asm/pgtable.h> | 35 | #include <asm/pgtable.h> |
35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
@@ -45,20 +46,6 @@ | |||
45 | 46 | ||
46 | extern void ret_from_fork(void); | 47 | extern void ret_from_fork(void); |
47 | 48 | ||
48 | static struct fs_struct init_fs = INIT_FS; | ||
49 | static struct files_struct init_files = INIT_FILES; | ||
50 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | ||
51 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | ||
52 | struct mm_struct init_mm = INIT_MM(init_mm); | ||
53 | EXPORT_SYMBOL(init_mm); | ||
54 | |||
55 | union thread_union init_thread_union | ||
56 | __attribute__((__section__(".data.init_task"))) = | ||
57 | { INIT_THREAD_INFO(init_task) }; | ||
58 | |||
59 | struct task_struct init_task = INIT_TASK(init_task); | ||
60 | EXPORT_SYMBOL(init_task); | ||
61 | |||
62 | struct task_struct *current_set[NR_CPUS] = {&init_task, }; | 49 | struct task_struct *current_set[NR_CPUS] = {&init_task, }; |
63 | 50 | ||
64 | void (*pm_power_off)(void) = NULL; | 51 | void (*pm_power_off)(void) = NULL; |