diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-08-27 08:04:24 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 08:05:17 -0700 |
| commit | 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e (patch) | |
| tree | 28ebaaee56786cd9199e0e5802d166474d30d1e3 /fs/nfs/dns_resolve.c | |
| parent | HID: hid-debug: Show rdesc for unclaimed devices (diff) | |
| parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| download | wireguard-linux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.tar.xz wireguard-linux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.zip | |
Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
Diffstat (limited to 'fs/nfs/dns_resolve.c')
| -rw-r--r-- | fs/nfs/dns_resolve.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c index b3924b8a6000..31c26c4dcc23 100644 --- a/fs/nfs/dns_resolve.c +++ b/fs/nfs/dns_resolve.c @@ -8,6 +8,7 @@ #ifdef CONFIG_NFS_USE_KERNEL_DNS +#include <linux/module.h> #include <linux/sunrpc/clnt.h> #include <linux/dns_resolver.h> #include "dns_resolve.h" @@ -27,9 +28,11 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen, kfree(ip_addr); return ret; } +EXPORT_SYMBOL_GPL(nfs_dns_resolve_name); #else +#include <linux/module.h> #include <linux/hash.h> #include <linux/string.h> #include <linux/kmod.h> @@ -345,6 +348,7 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, ret = -ESRCH; return ret; } +EXPORT_SYMBOL_GPL(nfs_dns_resolve_name); int nfs_dns_resolver_cache_init(struct net *net) { |