Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 100015
b: refs/heads/master
c: 746f2eb
h: refs/heads/master
i:
  100013: 7bc87ea
  100011: be141fa
  100007: 9f63562
  99999: 6bc5b24
v: v3
  • Loading branch information
Cyrill Gorcunov authored and Ingo Molnar committed Jul 9, 2008
1 parent 5ff75d7 commit 529127b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d061e397db1ee7a62783a881833f3f9b89f6dc8
refs/heads/master: 746f2eb790e75676ddc3b816ba18bac4179cc744
23 changes: 23 additions & 0 deletions trunk/arch/x86/kernel/apic_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ int pic_mode;
/* Have we found an MP table */
int smp_found_config;

static struct resource lapic_resource = {
.name = "Local APIC",
.flags = IORESOURCE_MEM | IORESOURCE_BUSY,
};

static unsigned int calibration_result;

static int lapic_next_event(unsigned long delta,
Expand Down Expand Up @@ -1720,3 +1725,21 @@ static int __init apic_set_verbosity(char *str)
}
__setup("apic=", apic_set_verbosity);

static int __init lapic_insert_resource(void)
{
if (!apic_phys)
return -1;

/* Put local APIC into the resource map. */
lapic_resource.start = apic_phys;
lapic_resource.end = lapic_resource.start + PAGE_SIZE - 1;
insert_resource(&iomem_resource, &lapic_resource);

return 0;
}

/*
* need call insert after e820_reserve_resources()
* that is using request_resource
*/
late_initcall(lapic_insert_resource);

0 comments on commit 529127b

Please sign in to comment.