lkml.org 
[lkml]   [2007]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 01/23] introduce drm_zalloc as a drm_alloc + memset replacement
    Add drm_zalloc().

    Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>

    drivers/char/drm/drmP.h | 7 +++++++
    drivers/char/drm/drm_memory_debug.h | 17 ++++++++++++++---
    2 files changed, 21 insertions(+), 3 deletions(-)

    --- linux-2.6.23-rc3-mm1.orig/drivers/char/drm/drmP.h
    +++ linux-2.6.23-rc3-mm1/drivers/char/drm/drmP.h
    @@ -1125,10 +1125,17 @@ static __inline__ void *drm_calloc(size_
    {
    return kcalloc(nmemb, size, GFP_KERNEL);
    }
    +
    +/** Wrapper around kzalloc() */
    +static __inline__ void *drm_zalloc(size_t size, int area)
    +{
    + return kzalloc(size, GFP_KERNEL);
    +}
    #else
    extern void *drm_alloc(size_t size, int area);
    extern void drm_free(void *pt, size_t size, int area);
    extern void *drm_calloc(size_t nmemb, size_t size, int area);
    +extern void *drm_zalloc(size_t size, int area);
    #endif

    /*@}*/
    --- linux-2.6.23-rc3-mm1.orig/drivers/char/drm/drm_memory_debug.h
    +++ linux-2.6.23-rc3-mm1/drivers/char/drm/drm_memory_debug.h
    @@ -167,13 +167,24 @@ void *drm_alloc (size_t size, int area)
    void *drm_calloc (size_t nmemb, size_t size, int area) {
    void *addr;

    - addr = drm_alloc (nmemb * size, area);
    - if (addr != NULL)
    - memset((void *)addr, 0, size * nmemb);
    + addr = drm_alloc(nmemb * size, area);
    + if (!addr)
    + memset(addr, 0, size * nmemb);

    return addr;
    }

    +void *drm_zalloc(size_t size, int area)
    +{
    + void *addr;
    +
    + addr = drm_alloc(size, area);
    + if (!addr)
    + memset(addr, 0, size);
    +
    + return addr;
    +}
    +
    void *drm_realloc (void *oldpt, size_t oldsize, size_t size, int area) {
    void *pt;

    --
    -
    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: 2007-08-27 23:17    [W:0.023 / U:29.888 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site