git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
fs
/
cifs
/
dns_resolve.c
diff --git
a/fs/cifs/dns_resolve.c
b/fs/cifs/dns_resolve.c
index
1e0c1bd
..
df4a306
100644
(file)
--- a/
fs/cifs/dns_resolve.c
+++ b/
fs/cifs/dns_resolve.c
@@
-78,7
+78,7
@@
dns_resolver_instantiate(struct key *key, const void *data,
}
key->type_data.x[0] = datalen;
-
rcu_assign_pointer(key->payload.data, ip)
;
+
key->payload.data = ip
;
return rc;
}