diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 07:48:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:55:25 -0400 |
commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /arch/ppc/syslib/ppc4xx_pic.c | |
parent | 8de242e60a441f177dd51b323894b17d3d63e9f2 (diff) |
[POWERPC] ARCH=ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/syslib/ppc4xx_pic.c')
-rw-r--r-- | arch/ppc/syslib/ppc4xx_pic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c index 745685df5984..ee0da4b4b993 100644 --- a/arch/ppc/syslib/ppc4xx_pic.c +++ b/arch/ppc/syslib/ppc4xx_pic.c | |||
@@ -96,7 +96,7 @@ UIC_HANDLERS(1); | |||
96 | UIC_HANDLERS(2); | 96 | UIC_HANDLERS(2); |
97 | UIC_HANDLERS(3); | 97 | UIC_HANDLERS(3); |
98 | 98 | ||
99 | static int ppc4xx_pic_get_irq(struct pt_regs *regs) | 99 | static int ppc4xx_pic_get_irq(void) |
100 | { | 100 | { |
101 | u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); | 101 | u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); |
102 | if (uic0 & UIC0_UIC1NC) | 102 | if (uic0 & UIC0_UIC1NC) |
@@ -125,7 +125,7 @@ UIC_HANDLERS(0); | |||
125 | UIC_HANDLERS(1); | 125 | UIC_HANDLERS(1); |
126 | UIC_HANDLERS(2); | 126 | UIC_HANDLERS(2); |
127 | 127 | ||
128 | static int ppc4xx_pic_get_irq(struct pt_regs *regs) | 128 | static int ppc4xx_pic_get_irq(void) |
129 | { | 129 | { |
130 | u32 uicb = mfdcr(DCRN_UIC_MSR(UICB)); | 130 | u32 uicb = mfdcr(DCRN_UIC_MSR(UICB)); |
131 | if (uicb & UICB_UIC0NC) | 131 | if (uicb & UICB_UIC0NC) |
@@ -158,7 +158,7 @@ static void __init ppc4xx_pic_impl_init(void) | |||
158 | UIC_HANDLERS(0); | 158 | UIC_HANDLERS(0); |
159 | UIC_HANDLERS(1); | 159 | UIC_HANDLERS(1); |
160 | 160 | ||
161 | static int ppc4xx_pic_get_irq(struct pt_regs *regs) | 161 | static int ppc4xx_pic_get_irq(void) |
162 | { | 162 | { |
163 | u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); | 163 | u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); |
164 | if (uic0 & UIC0_UIC1NC) | 164 | if (uic0 & UIC0_UIC1NC) |
@@ -179,7 +179,7 @@ static void __init ppc4xx_pic_impl_init(void) | |||
179 | #define ACK_UIC0_PARENT | 179 | #define ACK_UIC0_PARENT |
180 | UIC_HANDLERS(0); | 180 | UIC_HANDLERS(0); |
181 | 181 | ||
182 | static int ppc4xx_pic_get_irq(struct pt_regs *regs) | 182 | static int ppc4xx_pic_get_irq(void) |
183 | { | 183 | { |
184 | u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); | 184 | u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); |
185 | return uic0 ? 32 - ffs(uic0) : -1; | 185 | return uic0 ? 32 - ffs(uic0) : -1; |