2006-10-25 20:11:49

by Om Narasimhan

[permalink] [raw]
Subject: Re: HPET : Legacy Routing Replacement Enable (02/03) - Generic

Patch 02/03 : Generic code changes.
------
Signed-Off-by : Om Narasimhan <[email protected]>

include/linux/acpi.h | 1 +
include/linux/hpet.h | 7 +++++++
2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 88b5dfd..aac4a89 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -220,6 +220,7 @@ enum acpi_interrupt_id {
};

#define ACPI_SPACE_MEM 0
+#define ACPI_HPET_LRR_CAP 0x8000

struct acpi_gen_regaddr {
u8 space_id;
diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 707f7cb..6c31473 100644
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -119,6 +119,13 @@ int hpet_register(struct hpet_task *, in
int hpet_unregister(struct hpet_task *);
int hpet_control(struct hpet_task *, unsigned int, unsigned long);

+
+/* these are used by time.c */
+extern void i8254_timer_resume(void);
+extern int using_apic_timer;
+extern int acpi_hpet_lrr;
+extern int hpet_lrr_force;
+
#endif /* __KERNEL__ */

struct hpet_info {