diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-21 14:45:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 15:50:12 -0400 |
commit | e47b65b032f2997aa0a7392ecdf656c86d4d7561 (patch) | |
tree | 801d2b42702da485506bcb19606489f0400a7c32 | |
parent | 8e95a53ba4b060e2d0d46575059ae96ea91a80fd (diff) |
net: drop NET dependency from HAVE_BPF_JIT
There is no point having the NET dependency on the select target, as it
forces all users to depend on NET to tell they support BPF_JIT. Move
the config option to the bottom of the file - this could be a nice place
also for future "selectable" config symbols.
Fix up all users to drop the dependency on NET now that it is not
required to supress warnings for non-NET builds.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/Kconfig | 2 | ||||
-rw-r--r-- | net/Kconfig | 7 |
5 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 36586dba6fa6..e19ed3fd3089 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -33,7 +33,7 @@ config ARM | |||
33 | select GENERIC_IRQ_SHOW | 33 | select GENERIC_IRQ_SHOW |
34 | select CPU_PM if (SUSPEND || CPU_IDLE) | 34 | select CPU_PM if (SUSPEND || CPU_IDLE) |
35 | select GENERIC_PCI_IOMAP | 35 | select GENERIC_PCI_IOMAP |
36 | select HAVE_BPF_JIT if NET | 36 | select HAVE_BPF_JIT |
37 | help | 37 | help |
38 | The ARM series is a line of low-power-consumption RISC chip designs | 38 | The ARM series is a line of low-power-consumption RISC chip designs |
39 | licensed by ARM Ltd and targeted at embedded applications and | 39 | licensed by ARM Ltd and targeted at embedded applications and |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index feab3bad6d0f..73ec03945717 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -141,7 +141,7 @@ config PPC | |||
141 | select IRQ_FORCED_THREADING | 141 | select IRQ_FORCED_THREADING |
142 | select HAVE_RCU_TABLE_FREE if SMP | 142 | select HAVE_RCU_TABLE_FREE if SMP |
143 | select HAVE_SYSCALL_TRACEPOINTS | 143 | select HAVE_SYSCALL_TRACEPOINTS |
144 | select HAVE_BPF_JIT if (PPC64 && NET) | 144 | select HAVE_BPF_JIT if PPC64 |
145 | select HAVE_ARCH_JUMP_LABEL | 145 | select HAVE_ARCH_JUMP_LABEL |
146 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 146 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
147 | 147 | ||
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 6c49ed2ee786..d176c03274c5 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -30,7 +30,7 @@ config SPARC | |||
30 | select USE_GENERIC_SMP_HELPERS if SMP | 30 | select USE_GENERIC_SMP_HELPERS if SMP |
31 | select GENERIC_PCI_IOMAP | 31 | select GENERIC_PCI_IOMAP |
32 | select HAVE_NMI_WATCHDOG if SPARC64 | 32 | select HAVE_NMI_WATCHDOG if SPARC64 |
33 | select HAVE_BPF_JIT if NET | 33 | select HAVE_BPF_JIT |
34 | 34 | ||
35 | config SPARC32 | 35 | config SPARC32 |
36 | def_bool !64BIT | 36 | def_bool !64BIT |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c9866b0b77d8..25f87bccbf8f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -77,7 +77,7 @@ config X86 | |||
77 | select GENERIC_CLOCKEVENTS_MIN_ADJUST | 77 | select GENERIC_CLOCKEVENTS_MIN_ADJUST |
78 | select IRQ_FORCED_THREADING | 78 | select IRQ_FORCED_THREADING |
79 | select USE_GENERIC_SMP_HELPERS if SMP | 79 | select USE_GENERIC_SMP_HELPERS if SMP |
80 | select HAVE_BPF_JIT if (X86_64 && NET) | 80 | select HAVE_BPF_JIT if X86_64 |
81 | select CLKEVT_I8253 | 81 | select CLKEVT_I8253 |
82 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 82 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
83 | select GENERIC_IOMAP | 83 | select GENERIC_IOMAP |
diff --git a/net/Kconfig b/net/Kconfig index 1e47bd03dde3..245831bec09a 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -246,9 +246,6 @@ config BQL | |||
246 | select DQL | 246 | select DQL |
247 | default y | 247 | default y |
248 | 248 | ||
249 | config HAVE_BPF_JIT | ||
250 | bool | ||
251 | |||
252 | config BPF_JIT | 249 | config BPF_JIT |
253 | bool "enable BPF Just In Time compiler" | 250 | bool "enable BPF Just In Time compiler" |
254 | depends on HAVE_BPF_JIT | 251 | depends on HAVE_BPF_JIT |
@@ -340,3 +337,7 @@ source "net/nfc/Kconfig" | |||
340 | 337 | ||
341 | 338 | ||
342 | endif # if NET | 339 | endif # if NET |
340 | |||
341 | # Used by archs to tell that they support BPF_JIT | ||
342 | config HAVE_BPF_JIT | ||
343 | bool | ||