[PATCH] x86/intel: fix indentation

[PATCH] x86/intel: fix indentation

[Roger Pau Monne]

Adjust line to use a hard tab and align using spaces afterwards, instead of
using all spaces.

Fixes: fc3090a47b21 ('x86/boot: Clear XD_DISABLE from the early boot path')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Realized while doing backports, not sure if it's worth fixing on it's own.
---
 xen/arch/x86/cpu/intel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index a8ba3191e618..dfee64689ffe 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -307,7 +307,7 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c)
 		c->x86_cache_alignment = 128;
 
 	if (c == &boot_cpu_data &&
-            bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE)
+	    bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE)
 		printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n");
 
 	/* Unmask CPUID levels and NX if masked: */
-- 
2.42.0

Re: [PATCH] x86/intel: fix indentation

[Jan Beulich]

On 13.11.2023 09:51, Roger Pau Monne wrote:
> Adjust line to use a hard tab and align using spaces afterwards, instead of
> using all spaces.
> 
> Fixes: fc3090a47b21 ('x86/boot: Clear XD_DISABLE from the early boot path')
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Acked-by: Jan Beulich <jbeulich@suse.com>

> ---
> Realized while doing backports, not sure if it's worth fixing on it's own.

Fine for staging, but regardless of the Fixes: tag not a backporting
candidate imo.

Jan

Re: [PATCH] x86/intel: fix indentation

[Roger Pau Monné]

On Mon, Nov 13, 2023 at 10:22:19AM +0100, Jan Beulich wrote:
> On 13.11.2023 09:51, Roger Pau Monne wrote:
> > Adjust line to use a hard tab and align using spaces afterwards, instead of
> > using all spaces.
> > 
> > Fixes: fc3090a47b21 ('x86/boot: Clear XD_DISABLE from the early boot path')
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> 
> Acked-by: Jan Beulich <jbeulich@suse.com>
> 
> > ---
> > Realized while doing backports, not sure if it's worth fixing on it's own.
> 
> Fine for staging, but regardless of the Fixes: tag not a backporting
> candidate imo.

No, not unless there's a further backport that requires the adjusted
context maybe.

Thanks, Roger.