lkml.org 
[lkml]   [2015]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/13] Move bp_type_idx to kernel/event/hw_breakpoint.c
    Date
    This has a "#ifdef CONFIG_*" that used to be exposed to userspace.

    The names in here are so generic that I don't think it's a good idea
    to expose them to userspace (or even the rest of the kernel). Since
    there's only one kernel user, it's been moved to that file.

    Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
    Reviewed-by: Andrew Waterman <waterman@eecs.berkeley.edu>
    Reviewed-by: Albert Ou <aou@eecs.berkeley.edu>
    ---
    include/uapi/linux/hw_breakpoint.h | 10 ----------
    kernel/events/hw_breakpoint.c | 10 ++++++++++
    2 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/include/uapi/linux/hw_breakpoint.h b/include/uapi/linux/hw_breakpoint.h
    index b04000a2296a..7a6a5a7f9511 100644
    --- a/include/uapi/linux/hw_breakpoint.h
    +++ b/include/uapi/linux/hw_breakpoint.h
    @@ -17,14 +17,4 @@ enum {
    HW_BREAKPOINT_INVALID = HW_BREAKPOINT_RW | HW_BREAKPOINT_X,
    };

    -enum bp_type_idx {
    - TYPE_INST = 0,
    -#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
    - TYPE_DATA = 0,
    -#else
    - TYPE_DATA = 1,
    -#endif
    - TYPE_MAX
    -};
    -
    #endif /* _UAPI_LINUX_HW_BREAKPOINT_H */
    diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c
    index 92ce5f4ccc26..5ad117e0f55b 100644
    --- a/kernel/events/hw_breakpoint.c
    +++ b/kernel/events/hw_breakpoint.c
    @@ -58,6 +58,16 @@ struct bp_cpuinfo {
    unsigned int flexible; /* XXX: placeholder, see fetch_this_slot() */
    };

    +enum bp_type_idx {
    + TYPE_INST = 0,
    +#if defined(CONFIG_HAVE_MIXED_BREAKPOINTS_REGS)
    + TYPE_DATA = 0,
    +#else
    + TYPE_DATA = 1,
    +#endif
    + TYPE_MAX
    +};
    +
    static DEFINE_PER_CPU(struct bp_cpuinfo, bp_cpuinfo[TYPE_MAX]);
    static int nr_slots[TYPE_MAX];

    --
    2.4.6


    \
     
     \ /
      Last update: 2015-09-15 01:01    [W:4.107 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site