lkml.org 
[lkml]   [2012]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 32/38] Split the switch_to() wrapper out of asm-generic/system.h [ver #3]
    Date
    Split the switch_to() wrapper out of asm-generic/system.h into its own
    asm-generic/system.h as part of the asm/system.h disintegration.

    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    ---

    include/asm-generic/switch_to.h | 30 ++++++++++++++++++++++++++++++
    include/asm-generic/system.h | 17 +----------------
    2 files changed, 31 insertions(+), 16 deletions(-)
    create mode 100644 include/asm-generic/switch_to.h

    diff --git a/include/asm-generic/switch_to.h b/include/asm-generic/switch_to.h
    new file mode 100644
    index 0000000..052c4ac
    --- /dev/null
    +++ b/include/asm-generic/switch_to.h
    @@ -0,0 +1,30 @@
    +/* Generic task switch macro wrapper, based on MN10300 definitions.
    + *
    + * It should be possible to use these on really simple architectures,
    + * but it serves more as a starting point for new ports.
    + *
    + * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
    + * Written by David Howells (dhowells@redhat.com)
    + *
    + * This program is free software; you can redistribute it and/or
    + * modify it under the terms of the GNU General Public Licence
    + * as published by the Free Software Foundation; either version
    + * 2 of the Licence, or (at your option) any later version.
    + */
    +#ifndef __ASM_GENERIC_SWITCH_TO_H
    +#define __ASM_GENERIC_SWITCH_TO_H
    +
    +#include <linux/thread_info.h>
    +
    +/*
    + * Context switching is now performed out-of-line in switch_to.S
    + */
    +extern struct task_struct *__switch_to(struct task_struct *,
    + struct task_struct *);
    +
    +#define switch_to(prev, next, last) \
    + do { \
    + ((last) = __switch_to((prev), (next))); \
    + } while (0)
    +
    +#endif /* __ASM_GENERIC_SWITCH_TO_H */
    diff --git a/include/asm-generic/system.h b/include/asm-generic/system.h
    index 54cd124..f2b8eb4 100644
    --- a/include/asm-generic/system.h
    +++ b/include/asm-generic/system.h
    @@ -14,25 +14,10 @@
    #ifndef __ASM_GENERIC_SYSTEM_H
    #define __ASM_GENERIC_SYSTEM_H

    -#ifndef __ASSEMBLY__
    -
    -#include <linux/types.h>
    -
    #include <asm/barrier.h>
    #include <asm/cmpxchg.h>
    -
    -struct task_struct;
    -
    -/* context switching is now performed out-of-line in switch_to.S */
    -extern struct task_struct *__switch_to(struct task_struct *,
    - struct task_struct *);
    -#define switch_to(prev, next, last) \
    - do { \
    - ((last) = __switch_to((prev), (next))); \
    - } while (0)
    +#include <asm/switch_to.h>

    #define arch_align_stack(x) (x)

    -#endif /* !__ASSEMBLY__ */
    -
    #endif /* __ASM_GENERIC_SYSTEM_H */


    \
     
     \ /
      Last update: 2012-03-15 22:03    [W:0.052 / U:0.660 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site