Subject: [PATCH] x86_64: Replace local_save_flags+local_irq_disable with local_irq_save.

The combination of "local_save_flags" and "local_irq_disable" seems to be
equivalent to "local_irq_save" (see code snips below). Consequently, replace
occurrences of local_save_flags+local_irq_disable with local_irq_save.

* local_irq_save
#define raw_local_irq_save(flags) \
do { (flags) = __raw_local_irq_save(); } while (0)

static inline unsigned long __raw_local_irq_save(void)
{
unsigned long flags = __raw_local_save_flags();

raw_local_irq_disable();

return flags;
}

* local_save_flags
#define raw_local_save_flags(flags) \
do { (flags) = __raw_local_save_flags(); } while (0)

Signed-off-by: Fernando Vazquez <[email protected]>
---

diff -urNp linux-2.6.18-rc3/arch/x86_64/kernel/apic.c linux-2.6.18-rc3-orig/arch/x86_64/kernel/apic.c
--- linux-2.6.18-rc3/arch/x86_64/kernel/apic.c 2006-08-02 18:05:41.000000000 +0900
+++ linux-2.6.18-rc3-orig/arch/x86_64/kernel/apic.c 2006-08-02 18:08:24.000000000 +0900
@@ -527,8 +527,7 @@ static int lapic_suspend(struct sys_devi
apic_pm_state.apic_tmict = apic_read(APIC_TMICT);
apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);
apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
- local_save_flags(flags);
- local_irq_disable();
+ local_irq_save(flags);
disable_local_APIC();
local_irq_restore(flags);
return 0;
diff -urNp linux-2.6.18-rc3/arch/x86_64/kernel/genapic_flat.c linux-2.6.18-rc3-orig/arch/x86_64/kernel/genapic_flat.c
--- linux-2.6.18-rc3/arch/x86_64/kernel/genapic_flat.c 2006-08-02 18:05:41.000000000 +0900
+++ linux-2.6.18-rc3-orig/arch/x86_64/kernel/genapic_flat.c 2006-08-02 18:09:18.000000000 +0900
@@ -49,8 +49,7 @@ static void flat_send_IPI_mask(cpumask_t
unsigned long cfg;
unsigned long flags;

- local_save_flags(flags);
- local_irq_disable();
+ local_irq_save(flags);

/*
* Wait for idle.



2006-08-02 10:18:33

by Andi Kleen

[permalink] [raw]
Subject: Re: [PATCH] x86_64: Replace local_save_flags+local_irq_disable with local_irq_save.

On Wednesday 02 August 2006 12:11, Fernando Luis V?zquez Cao wrote:
> The combination of "local_save_flags" and "local_irq_disable" seems to be
> equivalent to "local_irq_save" (see code snips below). Consequently, replace
> occurrences of local_save_flags+local_irq_disable with local_irq_save.

Added thanks

-Andi