From: Greg Kroah-Hartman Date: Sun, 26 Apr 2015 10:23:53 +0000 (+0200) Subject: 3.14-stable patches X-Git-Tag: v4.0.1~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21c583127dd0278bb6b8668f2f6757155e5906b0;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..f6f81847a90 --- /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 +Date: Sun, 16 Mar 2014 14:00:19 -0400 +Subject: sched: declare pid_alive as inline + +From: Richard Guy Briggs + +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 +Signed-off-by: Eric Paris +Signed-off-by: hujianyang +Signed-off-by: Greg Kroah-Hartman + +--- + 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 3c478ffd02b..876e617fa94 100644 --- 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