From: Doug Goldstein Date: Tue, 20 Mar 2018 10:23:29 +0000 (+0100) Subject: fix null sched build with clang and debug=n X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~373 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38d9184284793b075df97bc263eb8e4ae1ec7671;p=xen.git fix null sched build with clang and debug=n The null_dom() static inline is just used when debug=y so with clang it results in an error with the default CFLAGS and debug=n. This function is used in only one place and it a one line helper so remove it until we actually need it. Signed-off-by: Doug Goldstein Acked-by: Dario Faggioli --- diff --git a/xen/common/sched_null.c b/xen/common/sched_null.c index 58e306a7ea..58ddf7d889 100644 --- a/xen/common/sched_null.c +++ b/xen/common/sched_null.c @@ -120,11 +120,6 @@ static inline struct null_vcpu *null_vcpu(const struct vcpu *v) return v->sched_priv; } -static inline struct null_dom *null_dom(const struct domain *d) -{ - return d->sched_priv; -} - static inline bool vcpu_check_affinity(struct vcpu *v, unsigned int cpu, unsigned int balance_step) { @@ -677,7 +672,7 @@ static void null_vcpu_migrate(const struct scheduler *ops, struct vcpu *v, static inline void null_vcpu_check(struct vcpu *v) { struct null_vcpu * const nvc = null_vcpu(v); - struct null_dom * const ndom = null_dom(v->domain); + struct null_dom * const ndom = v->domain->sched_priv; BUG_ON(nvc->vcpu != v);