summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/cpu/interrupts.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-01-12 23:46:37 +0100
committerWolfgang Denk <wd@denx.de>2011-01-12 23:46:37 +0100
commit1ad98ad66e5bb8a46a186a92f180bb9592d47673 (patch)
tree51b0ccc9f51f816ee926afed6c6e65aabf6c8df1 /arch/microblaze/cpu/interrupts.c
parent3e5ab1af245da25633954c5b51c85cc8da0a5036 (diff)
parent1020286ef47bfa3b30430fbaa3f0dd464ff6eb9e (diff)
downloadblackbird-obmc-uboot-1ad98ad66e5bb8a46a186a92f180bb9592d47673.tar.gz
blackbird-obmc-uboot-1ad98ad66e5bb8a46a186a92f180bb9592d47673.zip
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'arch/microblaze/cpu/interrupts.c')
-rw-r--r--arch/microblaze/cpu/interrupts.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index e9d53c1afd..5a1321128a 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -41,8 +41,11 @@ void enable_interrupts (void)
int disable_interrupts (void)
{
+ unsigned int msr;
+
+ MFS(msr, rmsr);
MSRCLR(0x2);
- return 0;
+ return (msr & 0x2) != 0;
}
#ifdef CONFIG_SYS_INTC_0
OpenPOWER on IntegriCloud