lkml.org 
[lkml]   [2009]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: [PATCH 2/5] swiotlb: fix compile warning
    From
    On Tue, 24 Mar 2009 16:28:43 -0500
    Becky Bruce <beckyb@kernel.crashing.org> wrote:

    > Squash a build warning seen on 32-bit powerpc caused by calling min()
    > with 2 different types. Cast the first arg to size_t, which is the
    > type of the second, and should be portable across architectures.
    >
    > Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
    > ---
    > lib/swiotlb.c | 2 +-
    > 1 files changed, 1 insertions(+), 1 deletions(-)
    >
    > diff --git a/lib/swiotlb.c b/lib/swiotlb.c
    > index f59cf30..62f5f75 100644
    > --- a/lib/swiotlb.c
    > +++ b/lib/swiotlb.c
    > @@ -341,7 +341,7 @@ static void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
    > unsigned long flags;
    >
    > while (size) {
    > - sz = min(PAGE_SIZE - offset, size);
    > + sz = min((size_t)(PAGE_SIZE - offset), size);
    >
    > local_irq_save(flags);
    > buffer = kmap_atomic(pfn_to_page(pfn),

    ?

    diff --git a/lib/swiotlb.c b/lib/swiotlb.c
    index f59cf30..fa62498 100644
    --- a/lib/swiotlb.c
    +++ b/lib/swiotlb.c
    @@ -341,7 +341,7 @@ static void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
    unsigned long flags;

    while (size) {
    - sz = min(PAGE_SIZE - offset, size);
    + sz = min_t(size_t, PAGE_SIZE - offset, size);

    local_irq_save(flags);
    buffer = kmap_atomic(pfn_to_page(pfn),

    \
     
     \ /
      Last update: 2009-03-25 04:11    [W:0.032 / U:0.004 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site