From 85d1c4d3619014bc9c3a3ad840bcc51984665b94 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 27 Oct 2010 15:34:51 +0900 Subject: [PATCH] --- yaml --- r: 219589 b: refs/heads/master c: 31b37c73c56b4129ff22436af97b77719a4db852 h: refs/heads/master i: 219587: 2b8f23686f88702b1a45f5b92bdb1c639206a5fb v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/irq_64.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 9edac0428a6e..d7f905556f1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 071a1e33bac5c4ff8667d074be58365bd164b350 +refs/heads/master: 31b37c73c56b4129ff22436af97b77719a4db852 diff --git a/trunk/arch/sh/kernel/irq_64.c b/trunk/arch/sh/kernel/irq_64.c index 32365ba0e039..8fc05b997b6d 100644 --- a/trunk/arch/sh/kernel/irq_64.c +++ b/trunk/arch/sh/kernel/irq_64.c @@ -11,17 +11,17 @@ #include #include -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__ ( @@ -29,13 +29,13 @@ void notrace raw_local_irq_restore(unsigned long flags) "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; @@ -43,9 +43,9 @@ unsigned long notrace __raw_local_save_flags(void) "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);