lkml.org 
[lkml]   [2010]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 16/41] CAPI: Use non-atomic allocation during NCCI setup
    Date
    Both capincci_alloc and capiminor_alloc run in non-atomic context,
    update their memory allocations accordingly.

    Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
    ---
    drivers/isdn/capi/capi.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
    index 403bf8f..f8f8660 100644
    --- a/drivers/isdn/capi/capi.c
    +++ b/drivers/isdn/capi/capi.c
    @@ -217,7 +217,7 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
    unsigned int minor = 0;
    unsigned long flags;

    - mp = kzalloc(sizeof(*mp), GFP_ATOMIC);
    + mp = kzalloc(sizeof(*mp), GFP_KERNEL);
    if (!mp) {
    printk(KERN_ERR "capi: can't alloc capiminor\n");
    return NULL;
    @@ -358,7 +358,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
    {
    struct capincci *np, **pp;

    - np = kzalloc(sizeof(*np), GFP_ATOMIC);
    + np = kzalloc(sizeof(*np), GFP_KERNEL);
    if (!np)
    return NULL;
    np->ncci = ncci;
    --
    1.6.0.2


    \
     
     \ /
      Last update: 2010-02-08 21:45    [W:0.021 / U:29.960 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site