diff options
author | Dennis Chen <[email protected]> | 2016-05-31 11:23:44 +0100 |
---|---|---|
committer | Ingo Molnar <[email protected]> | 2016-06-03 09:57:36 +0200 |
commit | c75343972b79ef5bd44c498a63b326e37470bbfc (patch) | |
tree | 636737acbda9618ab3a4376b6db5c5958e8a203d /tools/perf/util/trace-event-scripting.c | |
parent | 55f1ea15216a5a14c96738bd5284100a00ffa9dc (diff) |
efi/arm: Fix the format of EFI debug messages
When both EFI and memblock debugging is enabled on the kernel command line:
'efi=debug memblock=debug'
.. the debug messages for early_con look the following way:
[ 0.000000] efi: 0x0000e1050000-0x0000e105ffff [Memory Mapped I/O |RUN| | | | | | | | | | |UC]
[ 0.000000] efi: 0x0000e1300000-0x0000e1300fff [Memory Mapped I/O |RUN| | | | | | | | | | |UC]
[ 0.000000] efi: 0x0000e8200000-0x0000e827ffff [Memory Mapped I/O |RUN| | | | | | | | | | |UC]
[ 0.000000] efi: 0x008000000000-0x008001e7ffff [Runtime Data |RUN| | | | | | | |WB|WT|WC|UC]
[ 0.000000] memblock_add: [0x00008000000000-0x00008001e7ffff] flags 0x0 early_init_dt_add_memory_arch+0x54/0x5c
[ 0.000000] *
...
Note the misplaced '*' line, which happened because the memblock debug message
was printed while the EFI debug message was still being constructed..
This patch fixes the output to be the expected:
[ 0.000000] efi: 0x0000e1050000-0x0000e105ffff [Memory Mapped I/O |RUN| | | | | | | | | | |UC]
[ 0.000000] efi: 0x0000e1300000-0x0000e1300fff [Memory Mapped I/O |RUN| | | | | | | | | | |UC]
[ 0.000000] efi: 0x0000e8200000-0x0000e827ffff [Memory Mapped I/O |RUN| | | | | | | | | | |UC]
[ 0.000000] efi: 0x008000000000-0x008001e7ffff [Runtime Data |RUN| | | | | | | |WB|WT|WC|UC]*
[ 0.000000] memblock_add: [0x00008000000000-0x00008001e7ffff] flags 0x0 early_init_dt_add_memory_arch+0x54/0x5c
...
Note how the '*' is now in the proper EFI debug message line.
Signed-off-by: Dennis Chen <[email protected]>
Signed-off-by: Matt Fleming <[email protected]>
Acked-by: Mark Rutland <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Mark Salter <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steve Capper <[email protected]>
Cc: Steve McIntyre <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
[ Made the changelog more readable. ]
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions