Messages in this thread Patch in this message | | | Date | Sat, 19 Mar 2011 21:12:04 +0100 | Subject | Re: [PATCH 6/6] net/9p: Fix compile warning | From | Geert Uytterhoeven <> |
| |
These warnings?
net/9p/trans_common.c:45: warning: cast from pointer to integer of different size net/9p/trans_common.c:46: warning: cast from pointer to integer of different size net/9p/trans_common.c:72: warning: comparison of distinct pointer types lacks a cast
On Tue, Mar 1, 2011 at 09:51, Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> wrote: > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > net/9p/trans_common.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/9p/trans_common.c b/net/9p/trans_common.c > index d62b9aa..ca55e3b 100644 > --- a/net/9p/trans_common.c > +++ b/net/9p/trans_common.c > @@ -42,8 +42,8 @@ int > p9_nr_pages(struct p9_req_t *req) > { > int start_page, end_page;
In addition, the values may not fit in an int on 64-bit. Better use 'unsigned long'.
> - start_page = (unsigned long long)req->tc->pubuf >> PAGE_SHIFT; > - end_page = ((unsigned long long)req->tc->pubuf + req->tc->pbuf_size + > + start_page = (unsigned long)req->tc->pubuf >> PAGE_SHIFT; > + end_page = ((unsigned long)req->tc->pubuf + req->tc->pbuf_size + > PAGE_SIZE - 1) >> PAGE_SHIFT; > return end_page - start_page; > } > @@ -69,8 +69,8 @@ p9_payload_gup(struct p9_req_t *req, size_t *pdata_off, int *pdata_len, > *pdata_off = (size_t)req->tc->pubuf & (PAGE_SIZE-1); > > if (*pdata_off) > - first_page_bytes = min((PAGE_SIZE - *pdata_off), > - req->tc->pbuf_size); > + first_page_bytes = min(((size_t)PAGE_SIZE - *pdata_off), > + req->tc->pbuf_size); > > rpinfo = req->tc->private; > pdata_mapped_pages = get_user_pages_fast((unsigned long)req->tc->pubuf, > -- > 1.7.1
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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/
| |