public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Fernando Luis Vázquez Cao" <fernando@oss.ntt.co.jp>
To: Andi Kleen <ak@suse.de>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] x86_64: Replace local_save_flags+local_irq_disable with local_irq_save.
Date: Wed, 02 Aug 2006 19:11:20 +0900	[thread overview]
Message-ID: <1154513480.3268.21.camel@localhost.localdomain> (raw)

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 <fernando@intellilink.co.jp>
---

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.



             reply	other threads:[~2006-08-02 10:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-02 10:11 Fernando Luis Vázquez Cao [this message]
2006-08-02 10:18 ` [PATCH] x86_64: Replace local_save_flags+local_irq_disable with local_irq_save Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1154513480.3268.21.camel@localhost.localdomain \
    --to=fernando@oss.ntt.co.jp \
    --cc=ak@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox