Эх сурвалжийг харах

[SPARC64]: Fix build with CONFIG_NET disabled.

We can't export verify_compat_iovec when CONFIG_NET is
disabled, and consequently the Solaris compat module
should also depend upon CONFIG_NET.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 18 жил өмнө
parent
commit
d6898556e9

+ 1 - 1
arch/sparc64/Kconfig

@@ -408,7 +408,7 @@ config SUNOS_EMUL
 
 
 config SOLARIS_EMUL
 config SOLARIS_EMUL
 	tristate "Solaris binary emulation (EXPERIMENTAL)"
 	tristate "Solaris binary emulation (EXPERIMENTAL)"
-	depends on SPARC32_COMPAT && EXPERIMENTAL
+	depends on SPARC32_COMPAT && NET && EXPERIMENTAL
 	help
 	help
 	  This is experimental code which will enable you to run (many)
 	  This is experimental code which will enable you to run (many)
 	  Solaris binaries on your SPARC Linux machine.
 	  Solaris binaries on your SPARC Linux machine.

+ 1 - 1
arch/sparc64/kernel/sparc64_ksyms.c

@@ -221,7 +221,7 @@ EXPORT_SYMBOL(pci_dma_supported);
 /* I/O device mmaping on Sparc64. */
 /* I/O device mmaping on Sparc64. */
 EXPORT_SYMBOL(io_remap_pfn_range);
 EXPORT_SYMBOL(io_remap_pfn_range);
 
 
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) && defined(CONFIG_NET)
 /* Solaris/SunOS binary compatibility */
 /* Solaris/SunOS binary compatibility */
 EXPORT_SYMBOL(verify_compat_iovec);
 EXPORT_SYMBOL(verify_compat_iovec);
 #endif
 #endif