Commit a9060701 authored by Russell King's avatar Russell King

[ARM] Fix couple of compiler warnings:

arch/arm/kernel/time.c: Fix time_before type warning.
arch/arm/common/amba.c: Fix snprintf compiler warning.
parent d1c0dfc8
...@@ -50,7 +50,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, ...@@ -50,7 +50,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf,
if (nr_env < 2) if (nr_env < 2)
return -ENOMEM; return -ENOMEM;
snprintf(buf, bufsz, "AMBA_ID=%08lx", pcdev->periphid); snprintf(buf, bufsz, "AMBA_ID=%08x", pcdev->periphid);
*envp++ = buf; *envp++ = buf;
*envp++ = NULL; *envp++ = NULL;
return 0; return 0;
......
...@@ -116,7 +116,7 @@ static inline void do_set_rtc(void) ...@@ -116,7 +116,7 @@ static inline void do_set_rtc(void)
return; return;
if (next_rtc_update && if (next_rtc_update &&
time_before(xtime.tv_sec, next_rtc_update)) time_before((unsigned long)xtime.tv_sec, next_rtc_update))
return; return;
if (xtime.tv_nsec < 500000000 - ((unsigned) tick_nsec >> 1) && if (xtime.tv_nsec < 500000000 - ((unsigned) tick_nsec >> 1) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment