mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Nelson <james4765@cwazy.co.uk>
To: linux-kernel@vger.kernel.org, linuxsh-shmedia-dev@lists.sourceforge.net
Cc: lethal@linux-sh.org, James Nelson <james4765@cwazy.co.uk>
Subject: [PATCH 2/3] sh64: remove cli()/sti() in arch/sh64/mach-cayman/irq.c
Date: Tue, 4 Jan 2005 20:24:42 -0600	[thread overview]
Message-ID: <20050105022501.22297.18661.69457@localhost.localdomain> (raw)
In-Reply-To: <20050105022449.22297.54853.67329@localhost.localdomain>

Signed-off-by: James Nelson <james4765@gmail.com>

diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/sh64/mach-cayman/irq.c linux-2.6.10-mm1/arch/sh64/mach-cayman/irq.c
--- linux-2.6.10-mm1-original/arch/sh64/mach-cayman/irq.c	2004-12-24 16:35:40.000000000 -0500
+++ linux-2.6.10-mm1/arch/sh64/mach-cayman/irq.c	2005-01-04 21:07:39.756694978 -0500
@@ -64,11 +64,11 @@
 	irq -= START_EXT_IRQS;
 	reg = EPLD_MASK_BASE + ((irq / 8) << 2);
 	bit = 1<<(irq % 8);
-	save_and_cli(flags);
+	local_irq_save(flags);
 	mask = ctrl_inl(reg);
 	mask |= bit;
 	ctrl_outl(mask, reg);
-	restore_flags(flags);
+	local_irq_restore(flags);
 }
 
 void disable_cayman_irq(unsigned int irq)
@@ -81,11 +81,11 @@
 	irq -= START_EXT_IRQS;
 	reg = EPLD_MASK_BASE + ((irq / 8) << 2);
 	bit = 1<<(irq % 8);
-	save_and_cli(flags);
+	local_irq_save(flags);
 	mask = ctrl_inl(reg);
 	mask &= ~bit;
 	ctrl_outl(mask, reg);
-	restore_flags(flags);
+	local_irq_restore(flags);
 }
 
 static void ack_cayman_irq(unsigned int irq)

  parent reply	other threads:[~2005-01-05  2:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-05  2:24 [PATCH 0/3] sh64: remove cli()/sti() from arch/sh64/* James Nelson
2005-01-05  2:24 ` [PATCH 1/3] sh64: remove cli()/sti() in arch/sh64/kernel/time.c James Nelson
2005-01-05  2:24 ` James Nelson [this message]
2005-01-05  2:24 ` [PATCH 3/3] sh64: remove cli()/sti() in arch/sh64/mm/fault.c James Nelson

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=20050105022501.22297.18661.69457@localhost.localdomain \
    --to=james4765@cwazy.co.uk \
    --cc=lethal@linux-sh.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxsh-shmedia-dev@lists.sourceforge.net \
    /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

all inboxes | Powered by JetHome®