Skip to content

perf cs-etm: Move definition of 'traceid_list' global variable from h…#112

Merged
otavio merged 1 commit intoFreescale:5.4-2.1.x-imxfrom
zandrey:5.4-2.1.x-imx
Aug 27, 2020
Merged

perf cs-etm: Move definition of 'traceid_list' global variable from h…#112
otavio merged 1 commit intoFreescale:5.4-2.1.x-imxfrom
zandrey:5.4-2.1.x-imx

Conversation

@zandrey
Copy link
Copy Markdown

@zandrey zandrey commented Aug 27, 2020

…eader file

The variable 'traceid_list' is defined in the header file cs-etm.h,
if multiple C files include cs-etm.h the compiler might complaint for
multiple definition of 'traceid_list'.

To fix multiple definition error, move the definition of 'traceid_list'
into cs-etm.c.

Fixes: cd8bfd8 ("perf tools: Add processing of coresight metadata")
Reported-by: Thomas Backlund [email protected]
Signed-off-by: Leo Yan [email protected]
Reviewed-by: Mathieu Poirier [email protected]
Reviewed-by: Mike Leach [email protected]
Tested-by: Mike Leach [email protected]
Tested-by: Thomas Backlund [email protected]
Cc: Alexander Shishkin [email protected]
Cc: Jiri Olsa [email protected]
Cc: Mark Rutland [email protected]
Cc: Namhyung Kim [email protected]
Cc: Peter Zijlstra [email protected]
Cc: Suzuki Poulouse [email protected]
Cc: Tor Jeremiassen [email protected]
Cc: [email protected]
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo [email protected]
(cherry picked from commit 168200b)

…eader file

The variable 'traceid_list' is defined in the header file cs-etm.h,
if multiple C files include cs-etm.h the compiler might complaint for
multiple definition of 'traceid_list'.

To fix multiple definition error, move the definition of 'traceid_list'
into cs-etm.c.

Fixes: cd8bfd8 ("perf tools: Add processing of coresight metadata")
Reported-by: Thomas Backlund <[email protected]>
Signed-off-by: Leo Yan <[email protected]>
Reviewed-by: Mathieu Poirier <[email protected]>
Reviewed-by: Mike Leach <[email protected]>
Tested-by: Mike Leach <[email protected]>
Tested-by: Thomas Backlund <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Suzuki Poulouse <[email protected]>
Cc: Tor Jeremiassen <[email protected]>
Cc: [email protected]
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
(cherry picked from commit 168200b)
@zandrey
Copy link
Copy Markdown
Author

zandrey commented Aug 27, 2020

This is a cherry-pick from upstream, which solves the perf build issue with latest OE-Core changes.

@rehsack I guess you would need to have the same for QorIQ kernel fork.

-- andrey

@rehsack
Copy link
Copy Markdown

rehsack commented Aug 27, 2020

@zandrey thanks for the hint. I check it next time I update OE-core and will likely do some QorIQ kernel update than along the OE-core update :)

@otavio
Copy link
Copy Markdown
Member

otavio commented Aug 27, 2020

This need to be done to the other kernel versions we maintain, doesn't it?

@otavio otavio merged commit 0bd9fbb into Freescale:5.4-2.1.x-imx Aug 27, 2020
@zandrey
Copy link
Copy Markdown
Author

zandrey commented Aug 27, 2020

This need to be done to the other kernel versions we maintain, doesn't it?

Yes, I would prepare a separate PR for 5.4.x+fslc. As for 5.4-1.0.0-imx - I would combine it with upmerge to v5.4.61

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants