Changeset eb522e8 in mainline for kernel/arch/ia32/src/ia32.c
- Timestamp:
- 2011-06-01T08:43:42Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8d6c1f1
- Parents:
- 9e2e715 (diff), e51a514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified kernel/arch/ia32/src/ia32.c ¶
r9e2e715 reb522e8 157 157 void arch_post_smp_init(void) 158 158 { 159 /* Currently the only supported platform for ia32 is 'pc'. */ 160 static const char *platform = "pc"; 161 162 sysinfo_set_item_data("platform", NULL, (void *) platform, 163 str_size(platform)); 164 159 165 #ifdef CONFIG_PC_KBD 160 166 /* … … 187 193 #endif 188 194 189 /* 190 * This nasty hack should also go away ASAP. 191 */ 192 trap_virtual_enable_irqs(1 << IRQ_DP8390); 193 sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390); 195 if (irqs_info != NULL) 196 sysinfo_set_item_val(irqs_info, NULL, true); 197 198 sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000); 194 199 } 195 200 … … 211 216 * selector, and the descriptor->base is the correct address. 212 217 */ 213 unative_t sys_tls_set(unative_t addr)218 sysarg_t sys_tls_set(sysarg_t addr) 214 219 { 215 220 THREAD->arch.tls = addr;
Note:
See TracChangeset
for help on using the changeset viewer.