Skip to content

Commit

Permalink
sh64: update for IRQ flag handling naming changes.
Browse files Browse the repository at this point in the history
irq_32.c was updated for the new API, while irq_64.c was overlooked. This
syncs them up and gets things building again.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Oct 27, 2010
1 parent 071a1e3 commit 31b37c7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions arch/sh/kernel/irq_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
#include <linux/module.h>
#include <cpu/registers.h>

void notrace raw_local_irq_restore(unsigned long flags)
void notrace arch_local_irq_restore(unsigned long flags)
{
unsigned long long __dummy;

if (flags == RAW_IRQ_DISABLED) {
if (flags == ARCH_IRQ_DISABLED) {
__asm__ __volatile__ (
"getcon " __SR ", %0\n\t"
"or %0, %1, %0\n\t"
"putcon %0, " __SR "\n\t"
: "=&r" (__dummy)
: "r" (RAW_IRQ_DISABLED)
: "r" (ARCH_IRQ_DISABLED)
);
} else {
__asm__ __volatile__ (
"getcon " __SR ", %0\n\t"
"and %0, %1, %0\n\t"
"putcon %0, " __SR "\n\t"
: "=&r" (__dummy)
: "r" (~RAW_IRQ_DISABLED)
: "r" (~ARCH_IRQ_DISABLED)
);
}
}
EXPORT_SYMBOL(raw_local_irq_restore);
EXPORT_SYMBOL(arch_local_irq_restore);

unsigned long notrace __raw_local_save_flags(void)
unsigned long notrace arch_local_save_flags(void)
{
unsigned long flags;

__asm__ __volatile__ (
"getcon " __SR ", %0\n\t"
"and %0, %1, %0"
: "=&r" (flags)
: "r" (RAW_IRQ_DISABLED)
: "r" (ARCH_IRQ_DISABLED)
);

return flags;
}
EXPORT_SYMBOL(__raw_local_save_flags);
EXPORT_SYMBOL(arch_local_save_flags);

0 comments on commit 31b37c7

Please sign in to comment.