um: Use generic init_task (5b408241) · Commits · 戴 / test

arch/um/Kconfig.common

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ config UML
		select GENERIC_IRQ_SHOW
		select GENERIC_CPU_DEVICES
		select GENERIC_IO
		select HAVE_GENERIC_INIT_TASK

		config MMU
		bool

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \
		extra-y := vmlinux.lds
		clean-files :=

		obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \
		obj-y = config.o exec.o exitcode.o irq.o ksyms.o mem.o \
		physmem.o process.o ptrace.o reboot.o sigio.o \
		signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o \
		um_arch.o umid.o skas/

deleted100644 → 0

+0 −38

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,intel.linux}.com)
		* Licensed under the GPL
		*/

		#include "linux/sched.h"
		#include "linux/init_task.h"
		#include "linux/fs.h"
		#include "linux/module.h"
		#include "linux/mqueue.h"
		#include "asm/uaccess.h"

		static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
		static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
		/*
		* 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);

		/*
		* Initial thread structure.
		*
		* We need to make sure that this is 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 __init_task_data =
		{ INIT_THREAD_INFO(init_task) };

		union thread_union cpu0_irqstack
		__attribute__((__section__(".data..init_irqstack"))) =
		{ INIT_THREAD_INFO(init_task) };

+5 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include <linux/seq_file.h>
		#include <linux/string.h>
		#include <linux/utsname.h>
		#include <linux/sched.h>
		#include <asm/pgtable.h>
		#include <asm/processor.h>
		#include <asm/setup.h>
		@@ -47,6 +48,10 @@ struct cpuinfo_um boot_cpu_data = {
		.ipi_pipe = { -1, -1 }
		};

		union thread_union cpu0_irqstack
		__attribute__((__section__(".data..init_irqstack"))) =
		{ INIT_THREAD_INFO(init_task) };

		unsigned long thread_saved_pc(struct task_struct *task)
		{
		/* FIXME: Need to look up userspace_pid by cpu */