lkml.org 
[lkml]   [2017]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.12 15/27] alpha: uapi: Add support for __SANE_USERSPACE_TYPES__
    Date
    4.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ben Hutchings <ben@decadent.org.uk>

    commit cec80d82142ab25c71eee24b529cfeaf17c43062 upstream.

    This fixes compiler errors in perf such as:

    tests/attr.c: In function 'store_event':
    tests/attr.c:66:27: error: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type '__u64 {aka long unsigned int}' [-Werror=format=]
    snprintf(path, PATH_MAX, "%s/event-%d-%llu-%d", dir,
    ^

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Tested-by: Michael Cree <mcree@orcon.net.nz>
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/alpha/include/asm/types.h | 2 +-
    arch/alpha/include/uapi/asm/types.h | 12 +++++++++++-
    2 files changed, 12 insertions(+), 2 deletions(-)

    --- a/arch/alpha/include/asm/types.h
    +++ b/arch/alpha/include/asm/types.h
    @@ -1,6 +1,6 @@
    #ifndef _ALPHA_TYPES_H
    #define _ALPHA_TYPES_H

    -#include <asm-generic/int-ll64.h>
    +#include <uapi/asm/types.h>

    #endif /* _ALPHA_TYPES_H */
    --- a/arch/alpha/include/uapi/asm/types.h
    +++ b/arch/alpha/include/uapi/asm/types.h
    @@ -9,8 +9,18 @@
    * need to be careful to avoid a name clashes.
    */

    -#ifndef __KERNEL__
    +/*
    + * This is here because we used to use l64 for alpha
    + * and we don't want to impact user mode with our change to ll64
    + * in the kernel.
    + *
    + * However, some user programs are fine with this. They can
    + * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here.
    + */
    +#if !defined(__SANE_USERSPACE_TYPES__) && !defined(__KERNEL__)
    #include <asm-generic/int-l64.h>
    +#else
    +#include <asm-generic/int-ll64.h>
    #endif

    #endif /* _UAPI_ALPHA_TYPES_H */

    \
     
     \ /
      Last update: 2017-09-05 09:16    [W:2.177 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site