From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Sat, 30 May 2020 00:52:13 +0000 (+0100)
Subject: xen/credit2: Fix build following c/s 8e2aa76dc (take 2)
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~123
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ad33a573c009d72466432b41ba0591c64e819c19;p=xen.git

xen/credit2: Fix build following c/s 8e2aa76dc (take 2)

OSSTest reports:

  credit2.c: In function 'cpu_runqueue_siblings_match':
  credit2.c:883:29: error: implicit declaration of function 'cpu_nr_siblings' [-Werror=implicit-function-declaration]
       unsigned int nr_sibls = cpu_nr_siblings(cpu);
                               ^~~~~~~~~~~~~~~
  credit2.c:883:5: error: nested extern declaration of 'cpu_nr_siblings' [-Werror=nested-externs]
       unsigned int nr_sibls = cpu_nr_siblings(cpu);
       ^~~~~~~~
  cc1: all warnings being treated as errors

For whatever reason, cpufeature.h's inclusion is conditional, and missing for
arm32.  Inlcude it explicitly.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c
index f4d3f8ae6b..eb5e5a78c5 100644
--- a/xen/common/sched/credit2.c
+++ b/xen/common/sched/credit2.c
@@ -25,6 +25,7 @@
 #include <xen/trace.h>
 #include <xen/cpu.h>
 #include <xen/keyhandler.h>
+#include <asm/cpufeature.h>
 #include <asm/processor.h>
 
 #include "private.h"