Changeset 357b5f5 in mainline for kernel/arch/amd64/src/amd64.c
- Timestamp:
- 2011-01-23T20:09:13Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- fdb9982c
- Parents:
- cead2aa (diff), 7e36c8d (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/amd64/src/amd64.c ¶
rcead2aa r357b5f5 199 199 void arch_post_smp_init(void) 200 200 { 201 /* Currently the only supported platform for amd64 is 'pc'. */ 202 static const char *platform = "pc"; 203 204 sysinfo_set_item_data("platform", NULL, (void *) platform, 205 str_size(platform)); 206 201 207 #ifdef CONFIG_PC_KBD 202 208 /* … … 229 235 #endif 230 236 231 /* 232 * This nasty hack should also go away ASAP. 233 */ 234 trap_virtual_enable_irqs(1 << IRQ_DP8390); 235 sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390); 237 if (irqs_info != NULL) 238 sysinfo_set_item_val(irqs_info, NULL, true); 239 240 sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000); 236 241 } 237 242 … … 256 261 * we need not to go to CPL0 to read it. 257 262 */ 258 unative_t sys_tls_set(unative_t addr)263 sysarg_t sys_tls_set(sysarg_t addr) 259 264 { 260 265 THREAD->arch.tls = addr;
Note:
See TracChangeset
for help on using the changeset viewer.