3.14-stable patches

added patches:
	sched-declare-pid_alive-as-inline.patch

diff --git a/queue-3.14/sched-declare-pid_alive-as-inline.patch b/queue-3.14/sched-declare-pid_alive-as-inline.patch
new file mode 100644 (file)
index 0000000..f6f8184
--- /dev/null
+++ b/queue-3.14/sched-declare-pid_alive-as-inline.patch
@@ -0,0 +1,37 @@
+From 80e0b6e8a001361316a2d62b748fe677ec46b860 Mon Sep 17 00:00:00 2001
+From: Richard Guy Briggs <rgb@redhat.com>
+Date: Sun, 16 Mar 2014 14:00:19 -0400
+Subject: sched: declare pid_alive as inline
+
+From: Richard Guy Briggs <rgb@redhat.com>
+
+commit 80e0b6e8a001361316a2d62b748fe677ec46b860 upstream.
+
+We accidentally declared pid_alive without any extern/inline connotation.
+Some platforms were fine with this, some like ia64 and mips were very angry.
+If the function is inline, the prototype should be inline!
+
+on ia64:
+include/linux/sched.h:1718: warning: 'pid_alive' declared inline after
+being called
+
+Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
+Signed-off-by: Eric Paris <eparis@redhat.com>
+Signed-off-by: hujianyang <hujianyang@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/sched.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1695,7 +1695,7 @@ static inline pid_t task_tgid_vnr(struct
+ }
+ 
+ 
+-static int pid_alive(const struct task_struct *p);
++static inline int pid_alive(const struct task_struct *p);
+ static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns)
+ {
+       pid_t pid = 0;

diff --git a/queue-3.14/series b/queue-3.14/series
index 3c478ffd02b0412d036cd38bf179e074deaac4a3..876e617fa942525b13836e6881fe412f7b349bca 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -31,3 +31,4 @@ mm-hwpoison-drop-lru_add_drain_all-in-__soft_offline_page.patch
 netfilter-conntrack-disable-generic-tracking-for-known-protocols.patch
 kvm-x86-sysenter-emulation-is-broken.patch
 move-d_rcu-from-overlapping-d_child-to-overlapping-d_alias.patch
+sched-declare-pid_alive-as-inline.patch