Re: [PATCH] Kbuild: fix mismatched if/endif pairs

2018-06-20 Thread Josh Poimboeuf
On Sun, Jun 17, 2018 at 06:16:07PM +0800, Xi Ruoyao wrote:
> In scripts/Makefile.build, there are two mismatched if/endif pairs.
> They stop the generation of orc unwind table if CONFIG_FTRACE_MCOUNT_RECORD
> is not set.  dmesg complains:
> 
> WARNING: WARNING: Bad or missing .orc_unwind table.  Disabling unwinder.
> 
> This comment moves an endif to match the if/endif pairs.
> 
> Signed-off-by: Xi Ruoyao 

Reviewed-by: Josh Poimboeuf 

-- 
Josh


Re: [PATCH] Kbuild: fix mismatched if/endif pairs

2018-06-20 Thread Josh Poimboeuf
On Sun, Jun 17, 2018 at 06:16:07PM +0800, Xi Ruoyao wrote:
> In scripts/Makefile.build, there are two mismatched if/endif pairs.
> They stop the generation of orc unwind table if CONFIG_FTRACE_MCOUNT_RECORD
> is not set.  dmesg complains:
> 
> WARNING: WARNING: Bad or missing .orc_unwind table.  Disabling unwinder.
> 
> This comment moves an endif to match the if/endif pairs.
> 
> Signed-off-by: Xi Ruoyao 

Reviewed-by: Josh Poimboeuf 

-- 
Josh


Re: [PATCH] Kbuild: fix mismatched if/endif pairs

2018-06-17 Thread Xi Ruoyao
On 2018-06-17 18:16 +0800, Xi Ruoyao wrote:
> In scripts/Makefile.build, there are two mismatched if/endif pairs.
> They stop the generation of orc unwind table if CONFIG_FTRACE_MCOUNT_RECORD
> is not set.  dmesg complains:

Duplication of patch 10455267 in patchwork.  Sorry for noise :(.

But let's fix this quickly, since the issue breaks ORC unwinder completely
(at least with my configuration).
-- 
Xi Ruoyao 
School of Aerospace Science and Technology, Xidian University


Re: [PATCH] Kbuild: fix mismatched if/endif pairs

2018-06-17 Thread Xi Ruoyao
On 2018-06-17 18:16 +0800, Xi Ruoyao wrote:
> In scripts/Makefile.build, there are two mismatched if/endif pairs.
> They stop the generation of orc unwind table if CONFIG_FTRACE_MCOUNT_RECORD
> is not set.  dmesg complains:

Duplication of patch 10455267 in patchwork.  Sorry for noise :(.

But let's fix this quickly, since the issue breaks ORC unwinder completely
(at least with my configuration).
-- 
Xi Ruoyao 
School of Aerospace Science and Technology, Xidian University


[PATCH] Kbuild: fix mismatched if/endif pairs

2018-06-17 Thread Xi Ruoyao
In scripts/Makefile.build, there are two mismatched if/endif pairs.
They stop the generation of orc unwind table if CONFIG_FTRACE_MCOUNT_RECORD
is not set.  dmesg complains:

WARNING: WARNING: Bad or missing .orc_unwind table.  Disabling unwinder.

This comment moves an endif to match the if/endif pairs.

Signed-off-by: Xi Ruoyao 
---
 scripts/Makefile.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 34d9e9ce97c2..16509a038d77 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -239,6 +239,7 @@ cmd_record_mcount = 
\
 "$(CC_FLAGS_FTRACE)" ]; then   \
$(sub_cmd_record_mcount)\
fi;
+endif # cc-option(-mrecord-mcount)
 endif # CONFIG_FTRACE_MCOUNT_RECORD
 
 ifdef CONFIG_STACK_VALIDATION
@@ -263,7 +264,6 @@ ifneq ($(RETPOLINE_CFLAGS),)
   objtool_args += --retpoline
 endif
 endif
-endif
 
 
 ifdef CONFIG_MODVERSIONS
-- 
2.16.2



[PATCH] Kbuild: fix mismatched if/endif pairs

2018-06-17 Thread Xi Ruoyao
In scripts/Makefile.build, there are two mismatched if/endif pairs.
They stop the generation of orc unwind table if CONFIG_FTRACE_MCOUNT_RECORD
is not set.  dmesg complains:

WARNING: WARNING: Bad or missing .orc_unwind table.  Disabling unwinder.

This comment moves an endif to match the if/endif pairs.

Signed-off-by: Xi Ruoyao 
---
 scripts/Makefile.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 34d9e9ce97c2..16509a038d77 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -239,6 +239,7 @@ cmd_record_mcount = 
\
 "$(CC_FLAGS_FTRACE)" ]; then   \
$(sub_cmd_record_mcount)\
fi;
+endif # cc-option(-mrecord-mcount)
 endif # CONFIG_FTRACE_MCOUNT_RECORD
 
 ifdef CONFIG_STACK_VALIDATION
@@ -263,7 +264,6 @@ ifneq ($(RETPOLINE_CFLAGS),)
   objtool_args += --retpoline
 endif
 endif
-endif
 
 
 ifdef CONFIG_MODVERSIONS
-- 
2.16.2