lkml.org 
[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] net ax25: Fix the build when sysctl support is disabled.
On 04/23/2012 05:25 PM, Eric W. Biederman wrote:

>
> Randy Dunlap <rdunlap@xenotime.net> reported:
>
>> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20120420:
>>
>>
>> include/net/ax25.h:447:75: error: expected ';' before '}' token
>>
>> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
>> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>>
>> First function: move ';' inside braces.
>> Second function: drop the ';'.
>
> Put the semicolons where it makes sense.
>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>


Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.

> ---
>
> Resent to include David Miller.
>
> include/net/ax25.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/ax25.h b/include/net/ax25.h
> index 8a7a122..5d23521 100644
> --- a/include/net/ax25.h
> +++ b/include/net/ax25.h
> @@ -444,8 +444,8 @@ extern void ax25_uid_free(void);
> extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
> extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
> #else
> -static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> -static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
> +static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
> +static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
> #endif /* CONFIG_SYSCTL */
>
> #endif



--
~Randy


\
 
 \ /
  Last update: 2012-04-24 03:33    [W:0.065 / U:2.652 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site