Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58191
b: refs/heads/master
c: 0f8dc2f
h: refs/heads/master
i:
  58189: 8e43d1c
  58187: df0dcae
  58183: a3ad88b
  58175: a2af70c
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Jul 4, 2007
1 parent 2c6ab9d commit 49c11cc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9d7542f891f22d16ea1465d19d253888e87f7ad6
refs/heads/master: 0f8dc2f06560e2ca126d1670a24126ba08357d38
19 changes: 0 additions & 19 deletions trunk/arch/i386/kernel/acpi/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -636,29 +636,10 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
return -1;
}

#define HPET_RESOURCE_NAME_SIZE 9
hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);
if (hpet_res) {
memset(hpet_res, 0, sizeof(*hpet_res));
hpet_res->name = (void *)&hpet_res[1];
hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,
"HPET %u", hpet_tbl->sequence);
hpet_res->end = (1 * 1024) - 1;
}

hpet_address = hpet_tbl->address.address;
printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
hpet_tbl->id, hpet_address);

res_start = hpet_address;

if (hpet_res) {
hpet_res->start = res_start;
hpet_res->end += res_start;
insert_resource(&iomem_resource, hpet_res);
}

return 0;
}
#else
Expand Down

0 comments on commit 49c11cc

Please sign in to comment.