]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
ipmi: work around gcc-4.9 build warning
authorArnd Bergmann <arnd@arndb.de>
Mon, 6 Oct 2014 19:17:52 +0000 (14:17 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Oct 2014 17:22:32 +0000 (13:22 -0400)
Building ipmi on arm with gcc-4.9 results in this warning for an
allmodconfig build:

  drivers/char/ipmi/ipmi_si_intf.c: In function 'ipmi_thread':
  include/linux/time.h:28:5: warning: 'busy_until.tv_sec' may be used uninitialized in this function [-Wmaybe-uninitialized]
    if (lhs->tv_sec > rhs->tv_sec)
       ^
  drivers/char/ipmi/ipmi_si_intf.c:1007:18: note: 'busy_until.tv_sec' was declared here
    struct timespec busy_until;
                    ^

The warning is bogus and this case can not occur.  Apparently this is a
false positive resulting from gcc getting a little smarter about
tracking assignments but not smart enough.

Marking the ipmi_thread_busy_wait function as inline gives the gcc
optimization logic enough information to figure out for itself that the
case cannot happen, which gets rid of the warning without adding any
fake initialization.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/ipmi/ipmi_si_intf.c

index 4fc89310bfb518176172433e3dbe4366d1c51427..1c43f9ac098988649d055b525aafa860aa866567 100644 (file)
@@ -965,9 +965,9 @@ static inline int ipmi_si_is_busy(struct timespec *ts)
        return ts->tv_nsec != -1;
 }
 
-static int ipmi_thread_busy_wait(enum si_sm_result smi_result,
-                                const struct smi_info *smi_info,
-                                struct timespec *busy_until)
+static inline int ipmi_thread_busy_wait(enum si_sm_result smi_result,
+                                       const struct smi_info *smi_info,
+                                       struct timespec *busy_until)
 {
        unsigned int max_busy_us = 0;