Re: [PATCH] compiler.h: Provide __always_inline to userspace headers too

[Denys Vlasenko]

On 03/29/2016 08:23 PM, Josh Boyer wrote:
> On Tue, Mar 29, 2016 at 2:14 PM, Denys Vlasenko <dvlasenk@xxxxxxxxxx> wrote:
>> Recent change to uapi/linux/swab.h needs this.
>>
>> Signed-off-by: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
>> CC: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx>
>> CC: Thomas Graf <tgraf@xxxxxxx>
>> CC: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
>> CC: David Rientjes <rientjes@xxxxxxxxxx>
>> CC: Arnd Bergmann <arnd@xxxxxxxx>
>> CC: Ingo Molnar <mingo@xxxxxxxxxx>
>> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
>> CC: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
>> CC: linux-kernel@xxxxxxxxxxxxxxx
>> ---
>>  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?