lkml.org 
[lkml]   [2006]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 26/67] Fix make headers_check on sh64

    -stable review patch. If anyone has any objections, please let us know.

    ------------------
    From: Paul Mundt <lethal@linux-sh.org>
    Cleanup for user headers, as noted:

    asm-sh64/page.h requires asm-generic/memory_model.h, which does not exist in exported headers
    asm-sh64/shmparam.h requires asm/cache.h, which does not exist in exported headers
    asm-sh64/signal.h requires asm/processor.h, which does not exist in exported headers
    asm-sh64/user.h requires asm/processor.h, which does not exist in exported headers

    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    include/asm-sh64/page.h | 3 +--
    include/asm-sh64/shmparam.h | 16 ++++------------
    include/asm-sh64/signal.h | 1 -
    include/asm-sh64/user.h | 1 -
    4 files changed, 5 insertions(+), 16 deletions(-)
    --- linux-2.6.18.orig/include/asm-sh64/page.h
    +++ linux-2.6.18/include/asm-sh64/page.h
    @@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; }
    #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
    VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

    -#endif /* __KERNEL__ */
    -
    #include <asm-generic/memory_model.h>
    #include <asm-generic/page.h>

    +#endif /* __KERNEL__ */
    #endif /* __ASM_SH64_PAGE_H */
    --- linux-2.6.18.orig/include/asm-sh64/shmparam.h
    +++ linux-2.6.18/include/asm-sh64/shmparam.h
    @@ -2,19 +2,11 @@
    #define __ASM_SH64_SHMPARAM_H

    /*
    - * This file is subject to the terms and conditions of the GNU General Public
    - * License. See the file "COPYING" in the main directory of this archive
    - * for more details.
    - *
    - * include/asm-sh64/shmparam.h
    - *
    - * Copyright (C) 2000, 2001 Paolo Alberelli
    - *
    + * Set this to a sensible safe default, we'll work out the specifics for the
    + * align mask from the cache descriptor at run-time.
    */
    +#define SHMLBA 0x4000

    -#include <asm/cache.h>
    -
    -/* attach addr a multiple of this */
    -#define SHMLBA (cpu_data->dcache.sets * L1_CACHE_BYTES)
    +#define __ARCH_FORCE_SHMLBA

    #endif /* __ASM_SH64_SHMPARAM_H */
    --- linux-2.6.18.orig/include/asm-sh64/signal.h
    +++ linux-2.6.18/include/asm-sh64/signal.h
    @@ -13,7 +13,6 @@
    */

    #include <linux/types.h>
    -#include <asm/processor.h>

    /* Avoid too many header ordering problems. */
    struct siginfo;
    --- linux-2.6.18.orig/include/asm-sh64/user.h
    +++ linux-2.6.18/include/asm-sh64/user.h
    @@ -13,7 +13,6 @@
    */

    #include <linux/types.h>
    -#include <asm/processor.h>
    #include <asm/ptrace.h>
    #include <asm/page.h>

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-11 23:29    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean