> On Oct 14, 2020, at 9:29 PM, Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote:
>
> On Tue, Oct 13, 2020 at 09:36:38PM -0700, Song Liu wrote:
>> Fix the following error when compiling selftests/bpf
>>
>> progs/profiler.inc.h:246:5: error: redefinition of 'pids_cgrp_id' as different kind of symbol
>>
>> pids_cgrp_id is used in cgroup code, and included in vmlinux.h. Fix the
>> error by renaming pids_cgrp_id as pids_cgroup_id.
>>
>> Fixes: 03d4d13fab3f ("selftests/bpf: Add profiler test")
>> Signed-off-by: Song Liu <songliubraving@xxxxxx>
>> ---
>> tools/testing/selftests/bpf/progs/profiler.inc.h | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/testing/selftests/bpf/progs/profiler.inc.h b/tools/testing/selftests/bpf/progs/profiler.inc.h
>> index 00578311a4233..b554c1e40b9fb 100644
>> --- a/tools/testing/selftests/bpf/progs/profiler.inc.h
>> +++ b/tools/testing/selftests/bpf/progs/profiler.inc.h
>> @@ -243,7 +243,7 @@ static ino_t get_inode_from_kernfs(struct kernfs_node* node)
>> }
>> }
>>
>> -int pids_cgrp_id = 1;
>> +int pids_cgroup_id = 1;
>
> I would prefer to try one of three options that Andrii suggested.
Ah, I missed that email (because of vger lag, I guess). Just verified
Andrii's version works.
Thanks,
Song
