Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c03e3126e4f9535f4983d727f036440255c43c82

Authored by Rakib Mullick
Committed by Linus Torvalds
1 parent 9263412501
Exists in master and in 7 other branches 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, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

codafs: fix build break when CONFIG_PROC_SYSCTL=n 

Commit 0bc825d240ab ("codafs: fix compile warning when CONFIG_SYSCTL=n")
introduces build breakage, when CONFIG_PROC_SYSCTL=n and
CONFIG_CODA_FS=y:

  fs/built-in.o: In function `init_coda':
  psdev.c:(.init.text+0xc02): undefined reference to `coda_sysctl_init'
  psdev.c:(.init.text+0xc7c): undefined reference to `coda_sysctl_clean'
  fs/built-in.o: In function `exit_coda':
  psdev.c:(.exit.text+0xa9): undefined reference to `coda_sysctl_clean'
  make: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com>
Reported-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

... ... @@ -61,5 +61,14 @@
61 61 fs_table_header = NULL;
62 62 }
63 63 }
  64 +
  65 +#else
  66 +void coda_sysctl_init(void)
  67 +{
  68 +}
  69 +
  70 +void coda_sysctl_clean(void)
  71 +{
  72 +}
64 73 #endif