Commit 2aa8601c authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/sfr
parents ab6671e9 1fa21420
...@@ -12,12 +12,11 @@ ...@@ -12,12 +12,11 @@
#include "ppc32-types.h" #include "ppc32-types.h"
#include "zlib.h" #include "zlib.h"
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/string.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
void memmove(void *dst, void *im, int len);
extern void *finddevice(const char *); extern void *finddevice(const char *);
extern int getprop(void *, const char *, void *, int); extern int getprop(void *, const char *, void *, int);
extern void printk(char *fmt, ...); extern void printk(char *fmt, ...);
......
...@@ -344,8 +344,8 @@ irq_recheck: ...@@ -344,8 +344,8 @@ irq_recheck:
recheck: recheck:
mfmsr r10 /* Get current interrupt state */ mfmsr r10 /* Get current interrupt state */
li r4,0 li r4,0
ori r4,r4,MSR_EE|MSR_RI ori r4,r4,MSR_EE
andc r10,r10,r4 /* clear MSR_EE and MSR_RI */ andc r10,r10,r4 /* clear MSR_EE */
mtmsrd r10,1 /* Update machine state */ mtmsrd r10,1 /* Update machine state */
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
...@@ -396,7 +396,7 @@ restore: ...@@ -396,7 +396,7 @@ restore:
mfmsr r0 mfmsr r0
li r2, MSR_RI li r2, MSR_RI
andc r0,r0,r2 andc r0,r0,r2
mtmsrd r0 mtmsrd r0,1
ld r0,_MSR(r1) ld r0,_MSR(r1)
mtspr SRR1,r0 mtspr SRR1,r0
...@@ -422,7 +422,7 @@ restore: ...@@ -422,7 +422,7 @@ restore:
/* Note: this must change if we start using the TIF_NOTIFY_RESUME bit */ /* Note: this must change if we start using the TIF_NOTIFY_RESUME bit */
do_work: do_work:
/* Enable interrupts */ /* Enable interrupts */
ori r10,r10,MSR_EE|MSR_RI ori r10,r10,MSR_EE
mtmsrd r10,1 mtmsrd r10,1
andi. r0,r3,_TIF_NEED_RESCHED andi. r0,r3,_TIF_NEED_RESCHED
......
...@@ -562,7 +562,7 @@ fast_exception_return: ...@@ -562,7 +562,7 @@ fast_exception_return:
mfmsr r20 mfmsr r20
li r21, MSR_RI li r21, MSR_RI
andc r20,r20,r21 andc r20,r20,r21
mtmsrd r20 mtmsrd r20,1
mtspr SRR1,r23 mtspr SRR1,r23
mtspr SRR0,r22 mtspr SRR0,r22
...@@ -989,7 +989,7 @@ _GLOBAL(do_stab_bolted) ...@@ -989,7 +989,7 @@ _GLOBAL(do_stab_bolted)
mfmsr r22 mfmsr r22
li r23, MSR_RI li r23, MSR_RI
andc r22,r22,r23 andc r22,r22,r23
mtmsrd r22 mtmsrd r22,1
ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */ ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */
ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */ ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */
...@@ -1094,7 +1094,7 @@ SLB_NUM_ENTRIES = 64 ...@@ -1094,7 +1094,7 @@ SLB_NUM_ENTRIES = 64
mfmsr r22 mfmsr r22
li r23, MSR_RI li r23, MSR_RI
andc r22,r22,r23 andc r22,r22,r23
mtmsrd r22 mtmsrd r22,1
ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */ ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */
ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */ ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */
......
...@@ -2040,11 +2040,11 @@ prom_bi_rec_verify(struct bi_record *bi_recs) ...@@ -2040,11 +2040,11 @@ prom_bi_rec_verify(struct bi_record *bi_recs)
if ( bi_recs == NULL || bi_recs->tag != BI_FIRST ) if ( bi_recs == NULL || bi_recs->tag != BI_FIRST )
return NULL; return NULL;
last = (struct bi_record *)bi_recs->data[0]; last = (struct bi_record *)(long)bi_recs->data[0];
if ( last == NULL || last->tag != BI_LAST ) if ( last == NULL || last->tag != BI_LAST )
return NULL; return NULL;
first = (struct bi_record *)last->data[0]; first = (struct bi_record *)(long)last->data[0];
if ( first == NULL || first != bi_recs ) if ( first == NULL || first != bi_recs )
return NULL; return NULL;
......
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