From bf0175de6c76779d4c8b0606de7bd2a5a0b87c7a Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 29 Oct 2012 17:25:00 +0000 Subject: pseries: Clean up inconsistent variable name in xics.c Throughout xics.c 'nr' is used to refer to a global interrupt number, and 'server' is used to refer to an interrupt server number (i.e. CPU number). Except in icp_set_mfrr(), where 'nr' is used as a server number. Fix this confusing inconsistency. Signed-off-by: David Gibson Signed-off-by: Alexander Graf --- hw/xics.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/xics.c') diff --git a/hw/xics.c b/hw/xics.c index ce88aa750b..7a899dd44f 100644 --- a/hw/xics.c +++ b/hw/xics.c @@ -108,13 +108,13 @@ static void icp_set_cppr(struct icp_state *icp, int server, uint8_t cppr) } } -static void icp_set_mfrr(struct icp_state *icp, int nr, uint8_t mfrr) +static void icp_set_mfrr(struct icp_state *icp, int server, uint8_t mfrr) { - struct icp_server_state *ss = icp->ss + nr; + struct icp_server_state *ss = icp->ss + server; ss->mfrr = mfrr; if (mfrr < CPPR(ss)) { - icp_check_ipi(icp, nr); + icp_check_ipi(icp, server); } } -- cgit v1.2.3