lkml.org 
[lkml]   [2012]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 25/29] um: Use generic init_task
    Same code. Use the generic version.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Richard Weinberger <richard@nod.at>
    ---
    arch/um/Kconfig.common | 1 +
    arch/um/kernel/Makefile | 2 +-
    arch/um/kernel/init_task.c | 38 --------------------------------------
    arch/um/kernel/um_arch.c | 5 +++++
    4 files changed, 7 insertions(+), 39 deletions(-)

    Index: tip/arch/um/Kconfig.common
    ===================================================================
    --- tip.orig/arch/um/Kconfig.common
    +++ tip/arch/um/Kconfig.common
    @@ -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
    Index: tip/arch/um/kernel/Makefile
    ===================================================================
    --- tip.orig/arch/um/kernel/Makefile
    +++ tip/arch/um/kernel/Makefile
    @@ -10,7 +10,7 @@ CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_ST
    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/
    Index: tip/arch/um/kernel/init_task.c
    ===================================================================
    --- tip.orig/arch/um/kernel/init_task.c
    +++ /dev/null
    @@ -1,38 +0,0 @@
    -/*
    - * 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) };
    Index: tip/arch/um/kernel/um_arch.c
    ===================================================================
    --- tip.orig/arch/um/kernel/um_arch.c
    +++ tip/arch/um/kernel/um_arch.c
    @@ -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 */



    \
     
     \ /
      Last update: 2012-04-30 22:21    [W:0.027 / U:1.816 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site