lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 246/294] mISDN: avoid arch specific __builtin_return_address call
    3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Arnd Bergmann <arnd@arndb.de>

    commit 3e7a8716e20b759eec0ad88145255bb33174f0c8 upstream.

    Not all architectures are able to call __builtin_return_address().
    On ARM, the mISDN code produces this warning:

    hardware/mISDN/w6692.c: In function 'w6692_dctrl':
    hardware/mISDN/w6692.c:1181:75: warning: unsupported argument to '__builtin_return_address'
    pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__,
    ^
    hardware/mISDN/mISDNipac.c: In function 'open_dchannel':
    hardware/mISDN/mISDNipac.c:759:75: warning: unsupported argument to '__builtin_return_address'
    pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__,
    ^

    In a lot of cases, this is relatively easy to work around by
    passing the value of __builtin_return_address(0) from the
    callers into the functions that want it. One exception is
    the indirect 'open' function call in struct isac_hw. While it
    would be possible to fix this as well, this patch only addresses
    the other callers properly and lets this one return the direct
    parent function, which should be good enough.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/isdn/hardware/mISDN/mISDNipac.c | 12 +++++++++---
    drivers/isdn/hardware/mISDN/w6692.c | 6 +++---
    2 files changed, 12 insertions(+), 6 deletions(-)

    --- a/drivers/isdn/hardware/mISDN/mISDNipac.c
    +++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
    @@ -754,10 +754,10 @@ dbusy_timer_handler(struct isac_hw *isac
    }

    static int
    -open_dchannel(struct isac_hw *isac, struct channel_req *rq)
    +open_dchannel_caller(struct isac_hw *isac, struct channel_req *rq, void *caller)
    {
    pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__,
    - isac->dch.dev.id, __builtin_return_address(1));
    + isac->dch.dev.id, caller);
    if (rq->protocol != ISDN_P_TE_S0)
    return -EINVAL;
    if (rq->adr.channel == 1)
    @@ -771,6 +771,12 @@ open_dchannel(struct isac_hw *isac, stru
    return 0;
    }

    +static int
    +open_dchannel(struct isac_hw *isac, struct channel_req *rq)
    +{
    + return open_dchannel_caller(isac, rq, __builtin_return_address(0));
    +}
    +
    static const char *ISACVer[] =
    {"2086/2186 V1.1", "2085 B1", "2085 B2",
    "2085 V2.3"};
    @@ -1547,7 +1553,7 @@ ipac_dctrl(struct mISDNchannel *ch, u32
    case OPEN_CHANNEL:
    rq = arg;
    if (rq->protocol == ISDN_P_TE_S0)
    - err = open_dchannel(isac, rq);
    + err = open_dchannel_caller(isac, rq, __builtin_return_address(0));
    else
    err = open_bchannel(ipac, rq);
    if (err)
    --- a/drivers/isdn/hardware/mISDN/w6692.c
    +++ b/drivers/isdn/hardware/mISDN/w6692.c
    @@ -1176,10 +1176,10 @@ w6692_l1callback(struct dchannel *dch, u
    }

    static int
    -open_dchannel(struct w6692_hw *card, struct channel_req *rq)
    +open_dchannel(struct w6692_hw *card, struct channel_req *rq, void *caller)
    {
    pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__,
    - card->dch.dev.id, __builtin_return_address(1));
    + card->dch.dev.id, caller);
    if (rq->protocol != ISDN_P_TE_S0)
    return -EINVAL;
    if (rq->adr.channel == 1)
    @@ -1207,7 +1207,7 @@ w6692_dctrl(struct mISDNchannel *ch, u32
    case OPEN_CHANNEL:
    rq = arg;
    if (rq->protocol == ISDN_P_TE_S0)
    - err = open_dchannel(card, rq);
    + err = open_dchannel(card, rq, __builtin_return_address(0));
    else
    err = open_bchannel(card, rq);
    if (err)
    \
     
     \ /
      Last update: 2017-11-08 20:59    [W:3.479 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site