diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
| commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
| tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /arch/mips/mm/cex-sb1.S | |
| parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
| parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/mm/cex-sb1.S')
| -rw-r--r-- | arch/mips/mm/cex-sb1.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mm/cex-sb1.S b/arch/mips/mm/cex-sb1.S index e54a62f2807c..2d08268bb705 100644 --- a/arch/mips/mm/cex-sb1.S +++ b/arch/mips/mm/cex-sb1.S | |||
| @@ -34,8 +34,6 @@ | |||
| 34 | * is changed. | 34 | * is changed. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | __INIT | ||
| 38 | |||
| 39 | .set mips64 | 37 | .set mips64 |
| 40 | .set noreorder | 38 | .set noreorder |
| 41 | .set noat | 39 | .set noat |
| @@ -51,6 +49,8 @@ | |||
| 51 | * (0x170-0x17f) are used to preserve k0, k1, and ra. | 49 | * (0x170-0x17f) are used to preserve k0, k1, and ra. |
| 52 | */ | 50 | */ |
| 53 | 51 | ||
| 52 | __CPUINIT | ||
| 53 | |||
| 54 | LEAF(except_vec2_sb1) | 54 | LEAF(except_vec2_sb1) |
| 55 | /* | 55 | /* |
| 56 | * If this error is recoverable, we need to exit the handler | 56 | * If this error is recoverable, we need to exit the handler |