[Xen-changelog] [xen stable-4.6] x86/mce: fix misleading indentation in init_nonfatal_mce_checker()

[patchbot@xxxxxxx]

commit ef6e53a83dc8948b44ffb4efa27c0c524f6d9f2a
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Feb 17 16:37:42 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Feb 17 16:37:42 2016 +0100

    x86/mce: fix misleading indentation in init_nonfatal_mce_checker()
    
    Debian bug 812166[0] reported this build failure due to
    Wmisleading-indentation with gcc-6:
    
    non-fatal.c: In function 'init_nonfatal_mce_checker':
    non-fatal.c:103:2: error: statement is indented as if it were guarded by... 
[-Werror=misleading-indentation]
      switch (c->x86_vendor) {
      ^~~~~~
    
    non-fatal.c:97:5: note: ...this 'if' clause, but it is not
         if ( __get_cpu_var(poll_bankmask) == NULL )
         ^~
    
    I was unable to reproduce (xen builds cleanly for me with "6.0.0 20160117
    (experimental) [trunk revision 232481]") but looking at the code the issue
    above is clearly real.
    
    Correctly reindent the if statement.
    
    This file uses Linux coding style (infact the use of Xen style for
    this line is the root cause of the wanring) so use tabs and while
    there remove the whitespace inside the if as Linux does.
    
    [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812166
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 2e46e3f2539d026594ec1618e7df2c2bc8785b42
    master date: 2016-01-22 16:19:51 +0100
---
 xen/arch/x86/cpu/mcheck/non-fatal.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c 
b/xen/arch/x86/cpu/mcheck/non-fatal.c
index 526864e..8cd6635 100644
--- a/xen/arch/x86/cpu/mcheck/non-fatal.c
+++ b/xen/arch/x86/cpu/mcheck/non-fatal.c
@@ -94,8 +94,8 @@ static int __init init_nonfatal_mce_checker(void)
        if (mce_disabled || !mce_available(c))
                return -ENODEV;
 
-    if ( __get_cpu_var(poll_bankmask) == NULL )
-        return -EINVAL;
+       if (__get_cpu_var(poll_bankmask) == NULL)
+               return -EINVAL;
 
        /*
         * Check for non-fatal errors every MCE_RATE s
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog