Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7

Authored by Justin P. Mattock
Committed by Sam Ravnborg
1 parent 559595a985
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

kbuild: fix C libary confusion in unifdef.c due to getline() 

This fixes an error when compiling the kernel.

  CHK     include/linux/version.h
  HOSTCC  scripts/unifdef
scripts/unifdef.c:209: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
make[1]: *** [scripts/unifdef] Error 1
make: *** [__headers] Error 2

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Cc:  Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -206,7 +206,7 @@
206 206 static void error(const char *);
207 207 static int findsym(const char *);
208 208 static void flushline(bool);
209   -static Linetype getline(void);
  209 +static Linetype get_line(void);
210 210 static Linetype ifeval(const char **);
211 211 static void ignoreoff(void);
212 212 static void ignoreon(void);
... ... @@ -512,7 +512,7 @@
512 512  
513 513 for (;;) {
514 514 linenum++;
515   - lineval = getline();
  515 + lineval = get_line();
516 516 trans_table[ifstate[depth]][lineval]();
517 517 debug("process %s -> %s depth %d",
518 518 linetype_name[lineval],
... ... @@ -526,7 +526,7 @@
526 526 * help from skipcomment().
527 527 */
528 528 static Linetype
529   -getline(void)
  529 +get_line(void)
530 530 {
531 531 const char *cp;
532 532 int cursym;