Commit 79fde358 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc32: ppc8xx build fixes

From: "Prof. BJ" <prof.bj@freemail.hu>

- m8xx_setup warning and mfmsr error fix
- ppc8xx_pic include error fix
- tqm8xxl.c typeing (syntax) error fix
- commproc.c include error and prototype warning fix

(acked by Matt Porter)
parent 45dc4f27
......@@ -33,6 +33,7 @@
#include <asm/pgtable.h>
#include <asm/8xx_immap.h>
#include <asm/commproc.h>
#include <asm/io.h>
extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep);
......@@ -55,11 +56,10 @@ static void alloc_host_memory(void);
#if 1
void
m8xx_cpm_reset()
m8xx_cpm_reset(void)
{
volatile immap_t *imp;
volatile cpm8xx_t *commproc;
pte_t *pte;
imp = (immap_t *)IMAP_ADDR;
commproc = (cpm8xx_t *)&imp->im_cpm;
......
......@@ -214,14 +214,13 @@ static void
m8xx_restart(char *cmd)
{
__volatile__ unsigned char dummy;
uint msr;
cli();
((immap_t *)IMAP_ADDR)->im_clkrst.car_plprcr |= 0x00000080;
/* Clear the ME bit in MSR to cause checkstop on machine check
*/
mtmsr(mfmsr(msr) & ~0x1000);
mtmsr(mfmsr() & ~0x1000);
dummy = ((immap_t *)IMAP_ADDR)->im_clkrst.res[0];
printk("Restart failed\n");
......@@ -248,8 +247,8 @@ m8xx_show_percpuinfo(struct seq_file *m, int i)
bp = (bd_t *)__res;
seq_printf(m, "clock\t\t: %dMHz\n"
"bus clock\t: %dMHz\n",
seq_printf(m, "clock\t\t: %ldMHz\n"
"bus clock\t: %ldMHz\n",
bp->bi_intfreq / 1000000,
bp->bi_busfreq / 1000000);
......
......@@ -3,6 +3,7 @@
#include <linux/config.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
extern struct hw_interrupt_type ppc8xx_pic;
......
......@@ -105,7 +105,7 @@ static struct mtd_partition tqm8xxl_fs_partitions[] = {
.name = "jffs",
.offset = 0x00200000,
.size = 0x00200000,
.//size = MTDPART_SIZ_FULL,
//.size = MTDPART_SIZ_FULL,
}
};
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment