git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_cds.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index
76b827c
..
953cd5d
100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@
-132,13
+132,12
@@
mpc85xx_cds_pcibios_fixup(void)
#ifdef CONFIG_PPC_I8259
#warning The i8259 PIC support is currently broken
#ifdef CONFIG_PPC_I8259
#warning The i8259 PIC support is currently broken
-static void mpc85xx_8259_cascade(unsigned int irq, struct
- irq_desc *desc, struct pt_regs *regs)
+static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
{
{
- unsigned int cascade_irq = i8259_irq(
regs
);
+ unsigned int cascade_irq = i8259_irq();
if (cascade_irq != NO_IRQ)
if (cascade_irq != NO_IRQ)
- generic_handle_irq(cascade_irq
, regs
);
+ generic_handle_irq(cascade_irq);
desc->chip->eoi(irq);
}
desc->chip->eoi(irq);
}
@@
-150,8
+149,10
@@
void __init mpc85xx_cds_pic_init(void)
struct mpic *mpic;
struct resource r;
struct device_node *np = NULL;
struct mpic *mpic;
struct resource r;
struct device_node *np = NULL;
+#ifdef CONFIG_PPC_I8259
struct device_node *cascade_node = NULL;
int cascade_irq;
struct device_node *cascade_node = NULL;
int cascade_irq;
+#endif
np = of_find_node_by_type(np, "open-pic");
np = of_find_node_by_type(np, "open-pic");
@@
-240,9
+241,9
@@
mpc85xx_cds_setup_arch(void)
cpu = of_find_node_by_type(NULL, "cpu");
if (cpu != 0) {
cpu = of_find_node_by_type(NULL, "cpu");
if (cpu != 0) {
- unsigned int *fp;
+
const
unsigned int *fp;
- fp =
(int *)
get_property(cpu, "clock-frequency", NULL);
+ fp = get_property(cpu, "clock-frequency", NULL);
if (fp != 0)
loops_per_jiffy = *fp / HZ;
else
if (fp != 0)
loops_per_jiffy = *fp / HZ;
else