Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 201303
b: refs/heads/master
c: ff48780
h: refs/heads/master
i:
  201301: c318f85
  201299: 0c1f99e
  201295: 8d6a800
v: v3
  • Loading branch information
Stefano Stabellini authored and Thomas Gleixner committed Jul 23, 2010
1 parent f5279be commit 8c4b158
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 087b255a2b43f417af83cb44e0bb02507f36b7fe
refs/heads/master: ff4878089e1eaeac79d57878ad4ea32910fb4037
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ fs_initcall(hpet_late_init);

void hpet_disable(void)
{
if (is_hpet_capable()) {
if (is_hpet_capable() && hpet_virt_address) {
unsigned int cfg = hpet_readl(HPET_CFG);

if (hpet_legacy_int_enabled) {
Expand Down

0 comments on commit 8c4b158

Please sign in to comment.