| Message ID | 1403432461-18296-1-git-send-email-manuel.schoelling@gmx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 06/22/2014 02:21 PM, Manuel Schölling wrote: > The time comparsion functions require arguments of type unsigned long > instead of (signed) long. > Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> [...] > diff --git a/init/do_mounts.c b/init/do_mounts.c > index 60c4196..2d069a3 100644 > --- a/init/do_mounts.c > +++ b/init/do_mounts.c > @@ -351,7 +351,6 @@ static void __init get_fs_names(char *page) > continue; > line++; > > - /* append fsname */ > memmove(fsnames, line, strlen(line)+1); > fsnames += strlen(fsnames)+1; > } while (page != NULL); > Seems like unrelated random change. WBR, Sergei
On So, 2014-06-22 at 15:15 +0400, Sergei Shtylyov wrote: > Hello. > > On 06/22/2014 02:21 PM, Manuel Schölling wrote: > > > The time comparsion functions require arguments of type unsigned long > > instead of (signed) long. > > > Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> > > [...] > > > diff --git a/init/do_mounts.c b/init/do_mounts.c > > index 60c4196..2d069a3 100644 > > --- a/init/do_mounts.c > > +++ b/init/do_mounts.c > > @@ -351,7 +351,6 @@ static void __init get_fs_names(char *page) > > continue; > > line++; > > > > - /* append fsname */ > > memmove(fsnames, line, strlen(line)+1); > > fsnames += strlen(fsnames)+1; > > } while (page != NULL); > > > > Seems like unrelated random change. Thanks, you are right: somehow this change made it into my patch. Probably I was not careful enough when using 'git commit -a'. Sorry, I will resend a fixed patch in a second. > > WBR, Sergei >
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 4ef818a..8a6e5c2 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -72,7 +72,7 @@ void temac_iow(struct temac_local *lp, int offset, u32 value) int temac_indirect_busywait(struct temac_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) { if (time_before_eq(end, jiffies)) { diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c index d4abf47..3b67d60 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c @@ -19,7 +19,7 @@ /* Wait till MDIO interface is ready to accept a new transaction.*/ int axienet_mdio_wait_until_ready(struct axienet_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) & XAE_MDIO_MCR_READY_MASK)) { if (time_before_eq(end, jiffies)) { diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 8c4aed3..782bb93 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -695,7 +695,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) static int xemaclite_mdio_wait(struct net_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; /* wait for the MDIO interface to not be busy or timeout after some time. diff --git a/init/do_mounts.c b/init/do_mounts.c index 60c4196..2d069a3 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -351,7 +351,6 @@ static void __init get_fs_names(char *page) continue; line++; - /* append fsname */ memmove(fsnames, line, strlen(line)+1); fsnames += strlen(fsnames)+1; } while (page != NULL);
The time comparsion functions require arguments of type unsigned long instead of (signed) long. Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> --- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- init/do_mounts.c | 1 - 4 files changed, 3 insertions(+), 4 deletions(-)