From: He Chen <he.chen@linux.intel.com>
Date: Fri, 16 Oct 2015 15:43:19 +0000 (+0200)
Subject: x86/PSR: fix compilation error after 44f126d
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2380
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=73b3bf10b475f4f8f92aba9a9de9ac433e53ead5;p=xen.git

x86/PSR: fix compilation error after 44f126d

In non-debug build ASSERT_UNREACHABLE is nop and some compilers will
complain that cbm_code/cbm_data may be used uninitialized in function
psr_set_l3_cbm. Add return after ASSERT_UNREACHABLE to fix it.

Signed-off-by: He Chen <he.chen@linux.intel.com>
---

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index d3dec3a331..f57ee77414 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -477,6 +477,7 @@ int psr_set_l3_cbm(struct domain *d, unsigned int socket,
 
     default:
         ASSERT_UNREACHABLE();
+        return -EINVAL;
     }
 
     spin_lock(&info->cbm_lock);