diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/mips/kernel/head.S | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/kernel/head.S')
| -rw-r--r-- | arch/mips/kernel/head.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index a64e87d22014..2a1b45d66f04 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S | |||
| @@ -107,7 +107,7 @@ | |||
| 107 | .endm | 107 | .endm |
| 108 | 108 | ||
| 109 | .macro setup_c0_status_pri | 109 | .macro setup_c0_status_pri |
| 110 | #ifdef CONFIG_MIPS64 | 110 | #ifdef CONFIG_64BIT |
| 111 | setup_c0_status ST0_KX 0 | 111 | setup_c0_status ST0_KX 0 |
| 112 | #else | 112 | #else |
| 113 | setup_c0_status 0 0 | 113 | setup_c0_status 0 0 |
| @@ -115,7 +115,7 @@ | |||
| 115 | .endm | 115 | .endm |
| 116 | 116 | ||
| 117 | .macro setup_c0_status_sec | 117 | .macro setup_c0_status_sec |
| 118 | #ifdef CONFIG_MIPS64 | 118 | #ifdef CONFIG_64BIT |
| 119 | setup_c0_status ST0_KX ST0_BEV | 119 | setup_c0_status ST0_KX ST0_BEV |
| 120 | #else | 120 | #else |
| 121 | setup_c0_status 0 ST0_BEV | 121 | setup_c0_status 0 ST0_BEV |
| @@ -215,7 +215,7 @@ NESTED(smp_bootstrap, 16, sp) | |||
| 215 | * slightly different layout ... | 215 | * slightly different layout ... |
| 216 | */ | 216 | */ |
| 217 | page swapper_pg_dir, _PGD_ORDER | 217 | page swapper_pg_dir, _PGD_ORDER |
| 218 | #ifdef CONFIG_MIPS64 | 218 | #ifdef CONFIG_64BIT |
| 219 | page invalid_pmd_table, _PMD_ORDER | 219 | page invalid_pmd_table, _PMD_ORDER |
| 220 | #endif | 220 | #endif |
| 221 | page invalid_pte_table, _PTE_ORDER | 221 | page invalid_pte_table, _PTE_ORDER |