Message-ID: <56FACAFA.4050209@redhat.com>
Date: Tue, 29 Mar 2016 20:35:38 +0200
From: Denys Vlasenko <dvlasenk@redhat.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0
MIME-Version: 1.0
To: Josh Boyer <jwboyer@fedoraproject.org>
CC: Linus Torvalds <torvalds@linux-foundation.org>,
        Thomas Graf <tgraf@suug.ch>, Peter Zijlstra <peterz@infradead.org>,
        David Rientjes <rientjes@google.com>, Arnd Bergmann <arnd@arndb.de>,
        Ingo Molnar <mingo@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] compiler.h: Provide __always_inline to userspace headers
 too
References: <1459275259-28040-1-git-send-email-dvlasenk@redhat.com> <CA+5PVA5=edrWFVM7xHQiFF3cv6buvihRHLY8enyJ4B8j6iOifA@mail.gmail.com>
In-Reply-To: <CA+5PVA5=edrWFVM7xHQiFF3cv6buvihRHLY8enyJ4B8j6iOifA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2096
Lines: 64

On 03/29/2016 08:23 PM, Josh Boyer wrote:
> On Tue, Mar 29, 2016 at 2:14 PM, Denys Vlasenko <dvlasenk@redhat.com> wrote:
>> Recent change to uapi/linux/swab.h needs this.
>>
>> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
>> CC: Josh Boyer <jwboyer@fedoraproject.org>
>> CC: Thomas Graf <tgraf@suug.ch>
>> CC: Peter Zijlstra <peterz@infradead.org>
>> CC: David Rientjes <rientjes@google.com>
>> CC: Arnd Bergmann <arnd@arndb.de>
>> CC: Ingo Molnar <mingo@kernel.org>
>> CC: Andrew Morton <akpm@linux-foundation.org>
>> CC: Linus Torvalds <torvalds@linux-foundation.org>
>> CC: linux-kernel@vger.kernel.org
>> ---
>>  include/linux/compiler.h | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/linux/compiler.h b/include/linux/compiler.h
>> index b5ff988..2cb6ba4 100644
>> --- a/include/linux/compiler.h
>> +++ b/include/linux/compiler.h
>> @@ -397,12 +397,12 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
>>   */
>>  #define noinline_for_stack noinline
>>
>> +#endif /* __KERNEL__ */
>> +
>>  #ifndef __always_inline
>>  #define __always_inline inline
>>  #endif
>>
>> -#endif /* __KERNEL__ */
>> -
> 
> Did you test this by installing the headers with 'make
> headers-install' and trying to build something with the newly
> installed headers?  As I said in my other email, I don't see how
> changes to this particular file are reflected in anything that gets
> installed in /usr/include by the uapi mechanism.

You're right, #include <linux/compiler.h> gets erased in the installed headers:

headers_install.sh
...
        sed -r \
                -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
                -e 's/__attribute_const__([ \t]|$)/\1/g' \
                -e 's@^#include <linux/compiler.h>@@' \
...

Need another location for this fix. How about uapi/linux/stddef.h ?
Currently it has just one line:

#include <linux/compiler.h>

(which gets dutifully yanked off by the install script, leaving empty file...)
Can we place

#ifndef __always_inline
#define __always_inline inline
#endif

here?