diff mbox

linux-next: Tree for April 29 (bpf_jit)

Message ID 1304097558.2686.6.camel@edumazet-laptop
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet April 29, 2011, 5:19 p.m. UTC 
Le vendredi 29 avril 2011 à 09:26 -0700, Randy Dunlap a écrit :
> On Fri, 29 Apr 2011 13:19:40 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20110428:
> 
> 
> when CONFIG_MODULES is not enabled:
> 
> bpf_jit_comp.c:(.text+0x43cc2): undefined reference to `module_free'
> (.text+0x4521a): undefined reference to `module_alloc'
> (.text+0x453af): undefined reference to `module_free'
> 
> 

Oh well, I guess we can add one 'depends on MODULES' like we do for
KPROBES (it also uses module_alloc())

Not sure many people build a !CONFIG_MODULES kernel these days...

Thanks Randy !

[PATCH net-next-2.6] bpf: depends on MODULES

module_alloc() and module_free() are available only if CONFIG_MODULES=y

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
 net/Kconfig |    1 +
 1 files changed, 1 insertion(+)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller April 29, 2011, 5:21 p.m. UTC | #1 
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 29 Apr 2011 19:19:18 +0200

> [PATCH net-next-2.6] bpf: depends on MODULES
> 
> module_alloc() and module_free() are available only if CONFIG_MODULES=y
> 
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>

Applied, thanks.

Perhaps we can solve these things by seperating out the dependency,
via "CONFIG_MODULE_ALLOC" and making things like KPROBES and
BPF 'select' it.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/Kconfig b/net/Kconfig
index 745fb02..878151c 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -238,6 +238,7 @@  config HAVE_BPF_JIT
 config BPF_JIT
 	bool "enable BPF Just In Time compiler"
 	depends on HAVE_BPF_JIT
+	depends on MODULES
 	---help---
 	  Berkeley Packet Filter filtering capabilities are normally handled
 	  by an interpreter. This option allows kernel to generate a native