[kernel/f17] Add patch from Linus Torvalds to fix 32-bit autofs4 build
Josh Boyer
jwboyer at fedoraproject.org
Sun Feb 26 16:04:33 UTC 2012
commit d55b8fbc5619de02f746dc142207c5da74bd5d62
Author: Josh Boyer <jwboyer at redhat.com>
Date: Sun Feb 26 11:04:13 2012 -0500
Add patch from Linus Torvalds to fix 32-bit autofs4 build
fix-autofs4-build.patch | 17 +++++++++++++++++
kernel.spec | 9 ++++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/fix-autofs4-build.patch b/fix-autofs4-build.patch
new file mode 100644
index 0000000..d8f3ae3
--- /dev/null
+++ b/fix-autofs4-build.patch
@@ -0,0 +1,17 @@
+ include/linux/compat.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/linux/compat.h b/include/linux/compat.h
+index 41c9f6515f46..7e05fcee75a1 100644
+--- a/include/linux/compat.h
++++ b/include/linux/compat.h
+@@ -561,5 +561,9 @@ asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid,
+ unsigned long liovcnt, const struct compat_iovec __user *rvec,
+ unsigned long riovcnt, unsigned long flags);
+
++#else
++
++#define is_compat_task() (0)
++
+ #endif /* CONFIG_COMPAT */
+ #endif /* _LINUX_COMPAT_H */
diff --git a/kernel.spec b/kernel.spec
index 3064497..c4e5eaa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -774,6 +774,8 @@ Patch21280: s390x-enable-keys-compat.patch
#rhbz 795544
Patch21290: ums_realtek-do-not-use-stack-memory-for-DMA-in-__do_.patch
+Patch21291: fix-autofs4-build.patch
+
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1493,6 +1495,8 @@ ApplyPatch s390x-enable-keys-compat.patch
#rhbz 795544
ApplyPatch ums_realtek-do-not-use-stack-memory-for-DMA-in-__do_.patch
+ApplyPatch fix-autofs4-build.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2374,6 +2378,9 @@ fi
# '-' | |
# '-'
%changelog
+* Sun Feb 26 2012 Josh Boyer <jwboyer at redhat.com> - 3.3.0-0.rc5.git0.3
+- Add patch from Linus Torvalds to fix 32-bit autofs4 build
+
* Sat Feb 25 2012 Josh Boyer <jwboyer at redhat.com> - 3.3.0-0.rc5.git0.2
- Disable debugging options.
More information about the scm-commits
mailing list