diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-08-02 20:35:26 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2010-08-02 20:35:26 -0400 |
| commit | 7512b7b33a8b2266c1b18619f0ffed5c77dcfed8 (patch) | |
| tree | 03706574e3078c90acaba1c7e1dfaf3a48f754f2 | |
| parent | 01d107eb777c3e528de30dcfdeaf9374ef3417d9 (diff) | |
| download | dom0-kernel-7512b7b33a8b2266c1b18619f0ffed5c77dcfed8.tar.gz dom0-kernel-7512b7b33a8b2266c1b18619f0ffed5c77dcfed8.tar.xz dom0-kernel-7512b7b33a8b2266c1b18619f0ffed5c77dcfed8.zip | |
Fix DNS resolver build broken in 2.6.32.17
| -rw-r--r-- | cifs-fix-dns-resolver.patch | 47 | ||||
| -rw-r--r-- | kernel.spec | 4 |
2 files changed, 51 insertions, 0 deletions
diff --git a/cifs-fix-dns-resolver.patch b/cifs-fix-dns-resolver.patch new file mode 100644 index 0000000..6a74fba --- /dev/null +++ b/cifs-fix-dns-resolver.patch @@ -0,0 +1,47 @@ +From: Chuck Ebbert <cebbert@redhat.com> + +CIFS: Fix DNS resolver build + +In file included from fs/cifs/dns_resolve.c:29: +fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver' + +Just remove the __init and __exit attributes from the init and exit +functions. __exit was removed upstream in 51c20fcced5badee0e2021c6c89f44aa3cbd72aa +anyway, and there's no point trying to save every byte by fixing +this properly. + +Signed-Off-By: Chuck Ebbert <cebbert@redhat.com> + +--- a/fs/cifs/dns_resolve.c ++++ b/fs/cifs/dns_resolve.c +@@ -176,7 +176,7 @@ out: + return rc; + } + +-int __init cifs_init_dns_resolver(void) ++int cifs_init_dns_resolver(void) + { + struct cred *cred; + struct key *keyring; +@@ -226,7 +226,7 @@ failed_put_cred: + return ret; + } + +-void __exit cifs_exit_dns_resolver(void) ++void cifs_exit_dns_resolver(void) + { + key_revoke(dns_resolver_cache->thread_keyring); + unregister_key_type(&key_type_dns_resolver); +--- a/fs/cifs/dns_resolve.h ++++ b/fs/cifs/dns_resolve.h +@@ -24,8 +24,8 @@ + #define _DNS_RESOLVE_H + + #ifdef __KERNEL__ +-extern int __init cifs_init_dns_resolver(void); +-extern void __exit cifs_exit_dns_resolver(void); ++extern int cifs_init_dns_resolver(void); ++extern void cifs_exit_dns_resolver(void); + extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr); + #endif /* KERNEL */ + diff --git a/kernel.spec b/kernel.spec index c9dd80f..6341a26 100644 --- a/kernel.spec +++ b/kernel.spec @@ -839,6 +839,7 @@ Patch14050: crypto-add-async-hash-testing.patch Patch14110: ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch Patch14115: xfs-prevent-swapext-from-operating-on-write-only-files.patch +Patch14120: cifs-fix-dns-resolver.patch # Red Hat Bugzilla #610911 Patch14130: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch @@ -1556,6 +1557,9 @@ ApplyPatch ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.p # CVE-2010-2266 ApplyPatch xfs-prevent-swapext-from-operating-on-write-only-files.patch +# fix DNS resolver build, broken in 2.6.32.17 +ApplyPatch cifs-fix-dns-resolver.patch + ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch # END OF PATCH APPLICATIONS ==================================================== |