Mercurial > hg > aboriginal

annotate sources/patches/linux-mips64fix.patch @ 1265:918501f802d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update squashfs and kernel to current versions.
author Rob Landley <rob@landley.net>
date Thu, 21 Oct 2010 19:09:51 -0500
parents a4734fc22a6d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1233
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 Commit f6be75d03c88 broke mips64, for no obvious reason. Reverting it fixes
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
2 things.
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
3
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
5 index 1a4dd65..4e00f9b 100644
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
6 --- a/arch/mips/kernel/traps.c
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 +++ b/arch/mips/kernel/traps.c
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
8 @@ -1599,7 +1599,7 @@ void __init trap_init(void)
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
9 ebase = (unsigned long)
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 __alloc_bootmem(size, 1 << fls(size), 0);
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
11 } else {
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 - ebase = CKSEG0;
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
13 + ebase = CAC_BASE;
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
14 if (cpu_has_mips_r2)
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
15 ebase += (read_c0_ebase() & 0x3ffff000);
a4734fc22a6d Revert the kernel commit that broke mips64.
Rob Landley <rob@landley.net>
parents:
diff changeset
16 }