Commit 3abec857 authored by Paul Mackerras's avatar Paul Mackerras

ppc64: Use merged versions of init_task.c and process.c.

These two files are now built in arch/powerpc/kernel instead of
arch/ppc64/kernel.
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fd582ec8
...@@ -42,7 +42,7 @@ endif ...@@ -42,7 +42,7 @@ endif
else else
# stuff used from here for ARCH=ppc or ARCH=ppc64 # stuff used from here for ARCH=ppc or ARCH=ppc64
obj-$(CONFIG_PPC64) += traps.o obj-$(CONFIG_PPC64) += traps.o process.o init_task.o
fpux-$(CONFIG_PPC32) += fpu.o fpux-$(CONFIG_PPC32) += fpu.o
extra-$(CONFIG_PPC_FPU) += $(fpux-y) extra-$(CONFIG_PPC_FPU) += $(fpux-y)
......
...@@ -8,10 +8,10 @@ EXTRA_CFLAGS += -mno-minimal-toc ...@@ -8,10 +8,10 @@ EXTRA_CFLAGS += -mno-minimal-toc
extra-y := head.o vmlinux.lds extra-y := head.o vmlinux.lds
obj-y := setup.o entry.o irq.o idle.o dma.o \ obj-y := setup.o entry.o irq.o idle.o dma.o \
time.o process.o signal.o syscalls.o misc.o ptrace.o \ time.o signal.o syscalls.o misc.o ptrace.o \
align.o bitops.o pacaData.o \ align.o bitops.o pacaData.o \
udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \ udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
ptrace32.o signal32.o rtc.o init_task.o \ ptrace32.o signal32.o rtc.o \
cputable.o cpu_setup_power4.o \ cputable.o cpu_setup_power4.o \
iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o
obj-y += vdso32/ vdso64/ obj-y += vdso32/ vdso64/
......
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/init_task.h>
#include <linux/fs.h>
#include <linux/mqueue.h>
#include <asm/uaccess.h>
static struct fs_struct init_fs = INIT_FS;
static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
EXPORT_SYMBOL(init_mm);
/*
* Initial thread structure.
*
* We need to make sure that this is 16384-byte aligned due to the
* way process stacks are handled. This is done by having a special
* "init_task" linker map entry..
*/
union thread_union init_thread_union
__attribute__((__section__(".data.init_task"))) =
{ INIT_THREAD_INFO(init_task) };
/*
* Initial task structure.
*
* All other task structs will be allocated on slabs in fork.c
*/
struct task_struct init_task = INIT_TASK(init_task);
EXPORT_SYMBOL(init_task);
This diff is collapsed.
...@@ -131,6 +131,10 @@ static inline void flush_altivec_to_thread(struct task_struct *t) ...@@ -131,6 +131,10 @@ static inline void flush_altivec_to_thread(struct task_struct *t)
} }
#endif #endif
static inline void flush_spe_to_thread(struct task_struct *t)
{
}
extern int mem_init_done; /* set on boot once kmalloc can be called */ extern int mem_init_done; /* set on boot once kmalloc can be called */
/* EBCDIC -> ASCII conversion for [0-9A-Z] on iSeries */ /* EBCDIC -> ASCII conversion for [0-9A-Z] on iSeries */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment