summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/xics.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-11-23 14:46:10 -0800
committerTony Lindgren <tony@atomide.com>2011-11-23 14:46:10 -0800
commit52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch)
tree86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /arch/powerpc/include/asm/xics.h
parente9b7086b80c4d9e354f4edc9e280ae85a60df408 (diff)
parent8770b07c2dff3cec2c751b289ee690137c88ea54 (diff)
downloadtalos-op-linux-52f3a41e0aca5625fbd118ed57a4debb25817e99.tar.gz
talos-op-linux-52f3a41e0aca5625fbd118ed57a4debb25817e99.zip
Merge branch 'fixes-v3.2-rc2' into fixes
Diffstat (limited to 'arch/powerpc/include/asm/xics.h')
-rw-r--r--arch/powerpc/include/asm/xics.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h
index bd6c401c0ee5..c48de98ba94e 100644
--- a/arch/powerpc/include/asm/xics.h
+++ b/arch/powerpc/include/asm/xics.h
@@ -15,8 +15,8 @@
#define DEFAULT_PRIORITY 5
/*
- * Mark IPIs as higher priority so we can take them inside interrupts that
- * arent marked IRQF_DISABLED
+ * Mark IPIs as higher priority so we can take them inside interrupts
+ * FIXME: still true now?
*/
#define IPI_PRIORITY 4
OpenPOWER on IntegriCloud