Re: [RFC PATCH v4 01/29] tools: Add __aligned_u64 to types.h

["Wangnan (F)" <wangnan0@huawei.com>]

On 2015/5/27 21:00, Arnaldo Carvalho de Melo wrote:
> Em Wed, May 27, 2015 at 05:19:36AM +0000, Wang Nan escreveu:
>> Following patches will introduce linux/bpf.h to a new libbpf library,
>> which requires definition of __aligned_u64. This patch add it to the
>> common types.h for tools.
> This was already merged, see:
>
> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/log/tools?h=perf/core
>
> More specifically:
>
> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/tools?h=perf/core&id=70ba6b8f975bcff56e180e2c7550d2302fcbf923
>
> So you can drop it from your patchset.
>
> BTW, where are you basing your work?
>
> If you do it over tip/perf/core you may find some of the trivial stuff
> being added there, like this one.
>   
> - Arnaldo

I base my work on v4.1-rc3. I tried tip/perf/core but there are 
confliction and some trival
problems (patch 'perf probe: Load map before glob matching' is found 
during rebasing), and
that branch changes quicker than mainline. If you and others are 
satisfied with the basic
idea of v4, I'd like to rebase v5 on tip/perf/core.

Thank you.

>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>> ---
>>   tools/include/linux/types.h | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/tools/include/linux/types.h b/tools/include/linux/types.h
>> index b5cf25e..10a2cdc 100644
>> --- a/tools/include/linux/types.h
>> +++ b/tools/include/linux/types.h
>> @@ -60,6 +60,11 @@ typedef __u32 __bitwise __be32;
>>   typedef __u64 __bitwise __le64;
>>   typedef __u64 __bitwise __be64;
>>   
>> +/* Taken from uapi/linux/types.h. Required by linux/bpf.h */
>> +#ifndef __aligned_u64
>> +# define __aligned_u64 __u64 __attribute__((aligned(8)))
>> +#endif
>> +
>>   struct list_head {
>>   	struct list_head *next, *prev;
>>   };
>> -- 
>> 1.8.3.4