From c547fcf9d1555f8f8edc363f061193d437b200e7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 Apr 2020 17:17:08 +0200 Subject: [PATCH] fix up queue-4.9/scripts-dtc-remove-redundant-yyloc-global-declaration.patch --- ...ve-redundant-yyloc-global-declaration.patch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/queue-4.9/scripts-dtc-remove-redundant-yyloc-global-declaration.patch b/queue-4.9/scripts-dtc-remove-redundant-yyloc-global-declaration.patch index 55dbb87370e..efead98aa57 100644 --- a/queue-4.9/scripts-dtc-remove-redundant-yyloc-global-declaration.patch +++ b/queue-4.9/scripts-dtc-remove-redundant-yyloc-global-declaration.patch @@ -34,11 +34,15 @@ Signed-off-by: David Gibson [robh: cherry-pick from upstream] Cc: stable@vger.kernel.org Signed-off-by: Rob Herring +[nc: Also apply to dtc-lexer.lex.c_shipped due to a lack of + e039139be8c2, where dtc-lexer.l started being used] +Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- - scripts/dtc/dtc-lexer.l | 1 - - 1 file changed, 1 deletion(-) + scripts/dtc/dtc-lexer.l | 1 - + scripts/dtc/dtc-lexer.lex.c_shipped | 1 - + 2 files changed, 2 deletions(-) --- a/scripts/dtc/dtc-lexer.l +++ b/scripts/dtc/dtc-lexer.l @@ -50,3 +54,13 @@ Signed-off-by: Greg Kroah-Hartman extern bool treesource_error; /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +--- a/scripts/dtc/dtc-lexer.lex.c_shipped ++++ b/scripts/dtc/dtc-lexer.lex.c_shipped +@@ -637,7 +637,6 @@ char *yytext; + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ -- 2.47.3