LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, gregkh@suse.de
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH -next] kobject.h: fix build when CONFIG_HOTPLUG is disabled
Date: Sun, 6 Feb 2011 21:57:18 -0800	[thread overview]
Message-ID: <20110206215718.185b6262.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20110207161902.a4c36e08.sfr@canb.auug.org.au>

From: Randy Dunlap <randy.dunlap@oracle.com>

When CONFIG_HOTPLUG is not enabled, the inline function add_uevent_var()
needs to have its __attribute__ before the function name/parameters,
otherwise there are syntax errors.

linux-next-20110207/include/linux/kobject.h:232: error: expected ',' or ';' before '{' token

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 include/linux/kobject.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- linux/include/linux/kobject.h.ORG	2011-02-06 21:47:23.000000000 -0800
+++ linux/include/linux/kobject.h	2011-02-06 21:44:56.000000000 -0800
@@ -226,9 +226,8 @@
 				      char *envp[])
 { return 0; }
 
-static inline int add_uevent_var(struct kobj_uevent_env *env,
-				 const char *format, ...)
-	__attribute__((format(printf, 2, 3)))
+static inline __attribute__((format(printf, 2, 3)))
+int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
 { return 0; }
 
 static inline int kobject_action_type(const char *buf, size_t count,

  reply	other threads:[~2011-02-07  5:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-07  5:19 linux-next: Tree for February 7 Stephen Rothwell
2011-02-07  5:57 ` Randy Dunlap [this message]
2011-02-10 17:38   ` [PATCH -next] kobject.h: fix build when CONFIG_HOTPLUG is disabled Randy Dunlap
2011-02-10 17:42     ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110206215718.185b6262.randy.dunlap@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: [PATCH -next] kobject.h: fix build when CONFIG_HOTPLUG is disabled' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).