summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMorten Rasmussen <morten.rasmussen@arm.com>2016-07-25 14:34:21 +0100
committerAndres Oportus <andresoportus@google.com>2017-06-02 08:01:51 -0700
commit3e9cdd5ae95a950c9cd3fc55a7f549ebed47aba6 (patch)
treed79ca46189b7229b5ec8896752b69c8c11735a14 /kernel
parentbc7c939b3a3adcf2cd15e33677ed9246d77e0074 (diff)
UPSTREAM: sched/core: Remove unnecessary NULL-pointer check
Checking if the sched_domain pointer returned by sd_init() is NULL seems pointless as sd_init() neither checks if it is valid to begin with nor set it to NULL. Change-Id: I5e16fd0c2ca7234b097be7c95409ddb15c5e9de9 Signed-off-by: Morten Rasmussen <morten.rasmussen@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: dietmar.eggemann@arm.com Cc: freedom.tan@mediatek.com Cc: keita.kobayashi.ym@renesas.com Cc: mgalbraith@suse.de Cc: sgurrappadi@nvidia.com Cc: vincent.guittot@linaro.org Cc: yuyang.du@intel.com Link: http://lkml.kernel.org/r/1469453670-2660-5-git-send-email-morten.rasmussen@arm.com Signed-off-by: Ingo Molnar <mingo@kernel.org> (cherry picked from commit 0e6d2a67a41321b3ef650b780a279a37855de08e) Signed-off-by: Chris Redpath <chris.redpath@arm.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 1df6da0094f0..8c5778053a20 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7275,8 +7275,6 @@ struct sched_domain *build_sched_domain(struct sched_domain_topology_level *tl,
struct sched_domain *child, int cpu)
{
struct sched_domain *sd = sd_init(tl, cpu);
- if (!sd)
- return child;
cpumask_and(sched_domain_span(sd), cpu_map, tl->mask(cpu));
if (child) {