Blackfin arch: merge adeos blackfin part to arch/blackfin/

[Mike Frysinger <vapier.adi@gmail.com>:
 - handle bf531/bf532/bf534/bf536 variants in ipipe.h
 - cleanup IPIPE logic for bfin_set_irq_handler()
 - cleanup ipipe asm code a bit and add missing ENDPROC()
 - simplify IPIPE code in trap_c
 - unify some of the IPIPE code and fix style
 - simplify DO_IRQ_L1 handling with ipipe code
 - revert IRQ_SW_INT# addition from ipipe merge
 - remove duplicate get_{c,s}clk() prototypes
]

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c
index 56f68d879b33..72e16605ca09 100644
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/arch/blackfin/mach-common/cpufreq.c
@@ -104,7 +104,7 @@ static int bfin_target(struct cpufreq_policy *policy,
                  cclk_hz, target_freq, freqs.old);
 
         cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        local_irq_save(flags);
+        local_irq_save_hw(flags);
                 plldiv = (bfin_read_PLL_DIV() & SSEL) | dpm_state_table[index].csel;
                 tscale = dpm_state_table[index].tscale;
                 bfin_write_PLL_DIV(plldiv);
@@ -115,7 +115,7 @@ static int bfin_target(struct cpufreq_policy *policy,
         cycles += 10; /* ~10 cycles we lose after get_cycles() */
         __bfin_cycles_off += (cycles << __bfin_cycles_mod) - (cycles << index);
         __bfin_cycles_mod = index;
-        local_irq_restore(flags);
+        local_irq_restore_hw(flags);
         /* TODO: just test case for cycles clock source, remove later */
         pr_debug("cpufreq: done\n");
         cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);