diff options
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/pgtable-32.h | 2 | ||||
-rw-r--r-- | include/asm-mips/sn/klconfig.h | 2 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/hubio.h | 12 | ||||
-rw-r--r-- | include/asm-mips/thread_info.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 0cff64ce0fb8..4d6bc45df594 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h | |||
@@ -206,7 +206,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot) | |||
206 | /* fixme */ | 206 | /* fixme */ |
207 | #define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f)) | 207 | #define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f)) |
208 | #define pgoff_to_pte(off) \ | 208 | #define pgoff_to_pte(off) \ |
209 | ((pte_t){(((off) & 0x3f) + ((off) << 6) + _PAGE_FILE)}) | 209 | ((pte_t){(((off) & 0x3f) + ((off) << 6) + _PAGE_FILE)}) |
210 | 210 | ||
211 | #else | 211 | #else |
212 | #define pte_to_pgoff(_pte) \ | 212 | #define pte_to_pgoff(_pte) \ |
diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h index d028e28d6239..9709ff701d9b 100644 --- a/include/asm-mips/sn/klconfig.h +++ b/include/asm-mips/sn/klconfig.h | |||
@@ -99,7 +99,7 @@ typedef s32 klconf_off_t; | |||
99 | #define ENABLE_BOARD 0x01 | 99 | #define ENABLE_BOARD 0x01 |
100 | #define FAILED_BOARD 0x02 | 100 | #define FAILED_BOARD 0x02 |
101 | #define DUPLICATE_BOARD 0x04 /* Boards like midplanes/routers which | 101 | #define DUPLICATE_BOARD 0x04 /* Boards like midplanes/routers which |
102 | are discovered twice. Use one of them */ | 102 | are discovered twice. Use one of them */ |
103 | #define VISITED_BOARD 0x08 /* Used for compact hub numbering. */ | 103 | #define VISITED_BOARD 0x08 /* Used for compact hub numbering. */ |
104 | #define LOCAL_MASTER_IO6 0x10 /* master io6 for that node */ | 104 | #define LOCAL_MASTER_IO6 0x10 /* master io6 for that node */ |
105 | #define GLOBAL_MASTER_IO6 0x20 | 105 | #define GLOBAL_MASTER_IO6 0x20 |
diff --git a/include/asm-mips/sn/sn0/hubio.h b/include/asm-mips/sn/sn0/hubio.h index 80cf6a52ed3b..f314da21b970 100644 --- a/include/asm-mips/sn/sn0/hubio.h +++ b/include/asm-mips/sn/sn0/hubio.h | |||
@@ -229,7 +229,7 @@ typedef union hubii_ilcsr_u { | |||
229 | icsr_llp_en: 1, /* LLP enable bit */ | 229 | icsr_llp_en: 1, /* LLP enable bit */ |
230 | icsr_rsvd2: 1, /* reserver */ | 230 | icsr_rsvd2: 1, /* reserver */ |
231 | icsr_wrm_reset: 1, /* Warm reset bit */ | 231 | icsr_wrm_reset: 1, /* Warm reset bit */ |
232 | icsr_rsvd1: 2, /* Data ready offset */ | 232 | icsr_rsvd1: 2, /* Data ready offset */ |
233 | icsr_null_to: 6; /* Null timeout */ | 233 | icsr_null_to: 6; /* Null timeout */ |
234 | 234 | ||
235 | } icsr_fields_s; | 235 | } icsr_fields_s; |
@@ -274,9 +274,9 @@ typedef union io_perf_sel { | |||
274 | u64 perf_sel_reg; | 274 | u64 perf_sel_reg; |
275 | struct { | 275 | struct { |
276 | u64 perf_rsvd : 48, | 276 | u64 perf_rsvd : 48, |
277 | perf_icct : 8, | 277 | perf_icct : 8, |
278 | perf_ippr1 : 4, | 278 | perf_ippr1 : 4, |
279 | perf_ippr0 : 4; | 279 | perf_ippr0 : 4; |
280 | } perf_sel_bits; | 280 | } perf_sel_bits; |
281 | } io_perf_sel_t; | 281 | } io_perf_sel_t; |
282 | 282 | ||
@@ -287,8 +287,8 @@ typedef union io_perf_cnt { | |||
287 | u64 perf_cnt; | 287 | u64 perf_cnt; |
288 | struct { | 288 | struct { |
289 | u64 perf_rsvd1 : 32, | 289 | u64 perf_rsvd1 : 32, |
290 | perf_rsvd2 : 12, | 290 | perf_rsvd2 : 12, |
291 | perf_cnt : 20; | 291 | perf_cnt : 20; |
292 | } perf_cnt_bits; | 292 | } perf_cnt_bits; |
293 | } io_perf_cnt_t; | 293 | } io_perf_cnt_t; |
294 | 294 | ||
diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h index fa193f861e71..f8d97dafd2f4 100644 --- a/include/asm-mips/thread_info.h +++ b/include/asm-mips/thread_info.h | |||
@@ -31,7 +31,7 @@ struct thread_info { | |||
31 | int preempt_count; /* 0 => preemptable, <0 => BUG */ | 31 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
32 | 32 | ||
33 | mm_segment_t addr_limit; /* thread address space: | 33 | mm_segment_t addr_limit; /* thread address space: |
34 | 0-0xBFFFFFFF for user-thead | 34 | 0-0xBFFFFFFF for user-thead |
35 | 0-0xFFFFFFFF for kernel-thread | 35 | 0-0xFFFFFFFF for kernel-thread |
36 | */ | 36 | */ |
37 | struct restart_block restart_block; | 37 | struct restart_block restart_block; |