From 4e8d8c1814d01fff949231f64e54580c7a3be108 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 4 May 2011 11:06:05 -0700
Subject: [PATCH] --- yaml --- r: 247059 b: refs/heads/master c:
 9cddf15f18865c4f7124d829be41799f59aaa5cf h: refs/heads/master i:   247057:
 7dec091e432e9d1a82c3ec628536df78737e7784   247055:
 6666b00dd84858d0ad487ab2960f242f16615efe v: v3

---
 [refs]                 | 2 +-
 trunk/arch/x86/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1cbd8deacdf0..6f3f25cfcbef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18a353f42817f08e3501162ceda9d2efddb08a40
+refs/heads/master: 9cddf15f18865c4f7124d829be41799f59aaa5cf
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 855a1bdc437d..2096cf180648 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -72,7 +72,7 @@ config X86
 	select IRQ_FORCED_THREADING
 	select USE_GENERIC_SMP_HELPERS if SMP
 	select ARCH_NO_SYSDEV_OPS
-	select HAVE_BPF_JIT if X86_64
+	select HAVE_BPF_JIT if (X86_64 && NET)
 
 config INSTRUCTION_DECODER
 	def_bool (KPROBES || PERF_EVENTS)