projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[linux-drm-fsl-dcu.git]
/
arch
/
powerpc
/
kernel
/
head_64.S
diff --git
a/arch/powerpc/kernel/head_64.S
b/arch/powerpc/kernel/head_64.S
index 71b1fe58e9e4d8a0a06fd9d3f6b3059f5e51c43f..97cedcd6c9b46e338bb28849b54fe72d03ff166f 100644
(file)
--- a/
arch/powerpc/kernel/head_64.S
+++ b/
arch/powerpc/kernel/head_64.S
@@
-613,7
+613,7
@@
system_call_pSeries:
/*** pSeries interrupt support ***/
/* moved from 0xf00 */
-
MASKABLE
_EXCEPTION_PSERIES(., performance_monitor)
+
STD
_EXCEPTION_PSERIES(., performance_monitor)
/*
* An interrupt came in while soft-disabled; clear EE in SRR1,