Re: Unresolved symbols

Re: Unresolved symbols

[Rusty Russell]

In message <5.0.2.1.2.20010105042217.0287d6f0@mail.reub.net> you write:
> Hi Rusty,
> 
> Some more unresolved symbols for you from the latest prerelease linux kernel:

Does this fix it?  If so I'll send to Linus...

Cheers,
Rusty.
--
http://linux.conf.au The Linux conference Australia needed.

diff -urN -I \$.*\$ -X /tmp/kerndiff.ObwPZl --minimal linux-2.4.0-official/net/ipv4/netfilter/Config.in working-2.4.0/net/ipv4/netfilter/Config.in
--- linux-2.4.0-official/net/ipv4/netfilter/Config.in	Tue Mar 28 04:35:56 2000
+++ working-2.4.0/net/ipv4/netfilter/Config.in	Sun Jan  7 16:48:59 2001
@@ -37,11 +37,20 @@
   fi
 
   if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
-    dep_tristate '  Full NAT' CONFIG_IP_NF_NAT $CONFIG_IP_NF_IPTABLES 
+    dep_tristate '  Full NAT' CONFIG_IP_NF_NAT $CONFIG_IP_NF_IPTABLES $CONFIG_IP_NF_CONNTRACK
     if [ "$CONFIG_IP_NF_NAT" != "n" ]; then
       define_bool CONFIG_IP_NF_NAT_NEEDED y
       dep_tristate '    MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
       dep_tristate '    REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
+      # If they want FTP, set to $CONFIG_IP_NF_NAT (m or y), 
+      # or $CONFIG_IP_NF_FTP (m or y), whichever is weaker.  Argh.
+      if [ "$CONFIG_IP_NF_FTP" = "m" ]; then
+	define_tristate CONFIG_IP_NF_NAT_FTP m
+      else
+	if [ "$CONFIG_IP_NF_FTP" = "y" ]; then
+	  define_tristate CONFIG_IP_NF_NAT_FTP $CONFIG_IP_NF_NAT
+	fi
+      fi
     fi
   fi
 
diff -urN -I \$.*\$ -X /tmp/kerndiff.ObwPZl --minimal linux-2.4.0-official/net/ipv4/netfilter/Makefile working-2.4.0/net/ipv4/netfilter/Makefile
--- linux-2.4.0-official/net/ipv4/netfilter/Makefile	Sat Dec 30 09:07:24 2000
+++ working-2.4.0/net/ipv4/netfilter/Makefile	Sat Jan  6 13:36:25 2001
@@ -35,7 +35,7 @@
 obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o
 
 # NAT helpers 
-obj-$(CONFIG_IP_NF_FTP) += ip_nat_ftp.o
+obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o
 
 # generic IP tables 
 obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

unresolved symbols

[Madhavi]

Hi

I have written a loadable kernel module for linux-2.4.19-pre10 (PPC). When
I try to do insmod, I am getting the following errors:

unresolved symbol __save_flags_ptr
unresolved symbol xmon
unresolved symbol __restore_flags
unresolved symbol __cli

When I compile the kernel without KMOD and MODEVERSIONS, I am not getting
these errors. There are some other symbols I am exporting from kernel
which seem to be getting resolved fine with and without MODVERSIONS and
KMOD.

I have included <asm/system.h> and <linux/module.h> in my files and I am
compiling the module with -D__KERNEL__ flags.

Any idea why this is happening?

regards
Madhavi.

Re: Unresolved symbols

[Rusty Russell]

In message <5.0.2.1.2.20010126010507.00af5128@mail.reub.net> you write:
> Hi again Rusty

God I'm an idiot.  I swear I've fixed this before.  <<search>>.  Yep,
I did.  And before that, the same bug in the conntrack code.

This fixed the `core nat compiled in, rest as modules' case, of
course, by actually exporting the symbols.

Rusty.
--
Premature optmztion is rt of all evl. --DK

diff -urN -I \$.*\$ -X /tmp/kerndiff.GyILWe --minimal linux-2.4.0-official/net/ipv4/netfilter/ip_nat_standalone.c working-2.4.0/net/ipv4/netfilter/ip_nat_standalone.c
--- linux-2.4.0-official/net/ipv4/netfilter/ip_nat_standalone.c	Tue Oct 31 09:27:49 2000
+++ working-2.4.0/net/ipv4/netfilter/ip_nat_standalone.c	Wed Jan 31 10:50:50 2001
@@ -330,11 +330,9 @@
 module_init(init);
 module_exit(fini);
 
-#ifdef MODULE
 EXPORT_SYMBOL(ip_nat_setup_info);
 EXPORT_SYMBOL(ip_nat_helper_register);
 EXPORT_SYMBOL(ip_nat_helper_unregister);
 EXPORT_SYMBOL(ip_nat_expect_register);
 EXPORT_SYMBOL(ip_nat_expect_unregister);
 EXPORT_SYMBOL(ip_nat_cheat_check);
-#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/