diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 7 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 25 | ||||
-rw-r--r-- | include/acpi/actypes.h | 6 | ||||
-rw-r--r-- | include/acpi/acutils.h | 4 | ||||
-rw-r--r-- | include/asm-i386/acpi.h | 23 | ||||
-rw-r--r-- | include/asm-i386/bootparam.h | 9 | ||||
-rw-r--r-- | include/asm-i386/ist.h | 10 | ||||
-rw-r--r-- | include/asm-i386/suspend.h | 2 | ||||
-rw-r--r-- | include/asm-ia64/acpi.h | 5 | ||||
-rw-r--r-- | include/asm-m68knommu/hw_irq.h | 4 | ||||
-rw-r--r-- | include/asm-m68knommu/mcfdma.h | 2 | ||||
-rw-r--r-- | include/asm-m68knommu/system.h | 4 | ||||
-rw-r--r-- | include/asm-m68knommu/timex.h | 24 | ||||
-rw-r--r-- | include/asm-x86_64/acpi.h | 22 | ||||
-rw-r--r-- | include/asm-x86_64/ist.h | 1 | ||||
-rw-r--r-- | include/asm-x86_64/suspend.h | 2 | ||||
-rw-r--r-- | include/linux/acpi.h | 1 | ||||
-rw-r--r-- | include/linux/apm_bios.h | 20 | ||||
-rw-r--r-- | include/linux/mod_devicetable.h | 6 | ||||
-rw-r--r-- | include/linux/pnp.h | 4 | ||||
-rw-r--r-- | include/linux/time.h | 8 |
21 files changed, 113 insertions, 76 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 5e3dcf3299bf..533ef40f7ccf 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -131,7 +131,7 @@ struct acpi_device_ops { | |||
131 | struct acpi_driver { | 131 | struct acpi_driver { |
132 | char name[80]; | 132 | char name[80]; |
133 | char class[80]; | 133 | char class[80]; |
134 | char *ids; /* Supported Hardware IDs */ | 134 | const struct acpi_device_id *ids; /* Supported Hardware IDs */ |
135 | struct acpi_device_ops ops; | 135 | struct acpi_device_ops ops; |
136 | struct device_driver drv; | 136 | struct device_driver drv; |
137 | struct module *owner; | 137 | struct module *owner; |
@@ -341,7 +341,8 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, | |||
341 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); | 341 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); |
342 | int acpi_bus_start(struct acpi_device *device); | 342 | int acpi_bus_start(struct acpi_device *device); |
343 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); | 343 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); |
344 | int acpi_match_ids(struct acpi_device *device, char *ids); | 344 | int acpi_match_device_ids(struct acpi_device *device, |
345 | const struct acpi_device_id *ids); | ||
345 | int acpi_create_dir(struct acpi_device *); | 346 | int acpi_create_dir(struct acpi_device *); |
346 | void acpi_remove_dir(struct acpi_device *); | 347 | void acpi_remove_dir(struct acpi_device *); |
347 | 348 | ||
@@ -365,6 +366,8 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer); | |||
365 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | 366 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); |
366 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 367 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
367 | 368 | ||
369 | int acpi_pm_device_sleep_state(struct device *, int, int *); | ||
370 | |||
368 | #endif /* CONFIG_ACPI */ | 371 | #endif /* CONFIG_ACPI */ |
369 | 372 | ||
370 | #endif /*__ACPI_BUS_H__*/ | 373 | #endif /*__ACPI_BUS_H__*/ |
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 553515912c0b..f85f77a538aa 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -34,16 +34,21 @@ | |||
34 | #define ACPI_BUS_COMPONENT 0x00010000 | 34 | #define ACPI_BUS_COMPONENT 0x00010000 |
35 | #define ACPI_SYSTEM_COMPONENT 0x02000000 | 35 | #define ACPI_SYSTEM_COMPONENT 0x02000000 |
36 | 36 | ||
37 | /* _HID definitions */ | 37 | /* |
38 | * _HID definitions | ||
39 | * HIDs must conform to ACPI spec(6.1.4) | ||
40 | * Linux specific HIDs do not apply to this and begin with LNX: | ||
41 | */ | ||
38 | 42 | ||
39 | #define ACPI_POWER_HID "power_resource" | 43 | #define ACPI_POWER_HID "LNXPOWER" |
40 | #define ACPI_PROCESSOR_HID "ACPI0007" | 44 | #define ACPI_PROCESSOR_HID "ACPI0007" |
41 | #define ACPI_SYSTEM_HID "acpi_system" | 45 | #define ACPI_SYSTEM_HID "LNXSYSTM" |
42 | #define ACPI_THERMAL_HID "thermal" | 46 | #define ACPI_THERMAL_HID "LNXTHERM" |
43 | #define ACPI_BUTTON_HID_POWERF "button_power" | 47 | #define ACPI_BUTTON_HID_POWERF "LNXPWRBN" |
44 | #define ACPI_BUTTON_HID_SLEEPF "button_sleep" | 48 | #define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN" |
45 | #define ACPI_VIDEO_HID "video" | 49 | #define ACPI_VIDEO_HID "LNXVIDEO" |
46 | #define ACPI_BAY_HID "bay" | 50 | #define ACPI_BAY_HID "LNXIOBAY" |
51 | |||
47 | /* -------------------------------------------------------------------------- | 52 | /* -------------------------------------------------------------------------- |
48 | PCI | 53 | PCI |
49 | -------------------------------------------------------------------------- */ | 54 | -------------------------------------------------------------------------- */ |
@@ -142,10 +147,6 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle) | |||
142 | /*-------------------------------------------------------------------------- | 147 | /*-------------------------------------------------------------------------- |
143 | Suspend/Resume | 148 | Suspend/Resume |
144 | -------------------------------------------------------------------------- */ | 149 | -------------------------------------------------------------------------- */ |
145 | #ifdef CONFIG_ACPI_SLEEP | ||
146 | extern int acpi_sleep_init(void); | 150 | extern int acpi_sleep_init(void); |
147 | #else | ||
148 | #define acpi_sleep_init() do {} while (0) | ||
149 | #endif | ||
150 | 151 | ||
151 | #endif /*__ACPI_DRIVERS_H__*/ | 152 | #endif /*__ACPI_DRIVERS_H__*/ |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index fe8abc276437..e73a38939120 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -809,7 +809,7 @@ acpi_status(*acpi_walk_callback) (acpi_handle obj_handle, | |||
809 | 809 | ||
810 | /* Common string version of device HIDs and UIDs */ | 810 | /* Common string version of device HIDs and UIDs */ |
811 | 811 | ||
812 | struct acpi_device_id { | 812 | struct acpica_device_id { |
813 | char value[ACPI_DEVICE_ID_LENGTH]; | 813 | char value[ACPI_DEVICE_ID_LENGTH]; |
814 | }; | 814 | }; |
815 | 815 | ||
@@ -859,8 +859,8 @@ struct acpi_device_info { | |||
859 | u32 valid; /* Indicates which fields below are valid */ | 859 | u32 valid; /* Indicates which fields below are valid */ |
860 | u32 current_status; /* _STA value */ | 860 | u32 current_status; /* _STA value */ |
861 | acpi_integer address; /* _ADR value if any */ | 861 | acpi_integer address; /* _ADR value if any */ |
862 | struct acpi_device_id hardware_id; /* _HID value if any */ | 862 | struct acpica_device_id hardware_id; /* _HID value if any */ |
863 | struct acpi_device_id unique_id; /* _UID value if any */ | 863 | struct acpica_device_id unique_id; /* _UID value if any */ |
864 | u8 highest_dstates[4]; /* _sx_d values: 0xFF indicates not valid */ | 864 | u8 highest_dstates[4]; /* _sx_d values: 0xFF indicates not valid */ |
865 | struct acpi_compatible_id_list compatibility_id; /* List of _CIDs if any */ | 865 | struct acpi_compatible_id_list compatibility_id; /* List of _CIDs if any */ |
866 | }; | 866 | }; |
diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h index a87ef1c8d46b..a2918547c73f 100644 --- a/include/acpi/acutils.h +++ b/include/acpi/acutils.h | |||
@@ -354,7 +354,7 @@ acpi_ut_evaluate_numeric_object(char *object_name, | |||
354 | 354 | ||
355 | acpi_status | 355 | acpi_status |
356 | acpi_ut_execute_HID(struct acpi_namespace_node *device_node, | 356 | acpi_ut_execute_HID(struct acpi_namespace_node *device_node, |
357 | struct acpi_device_id *hid); | 357 | struct acpica_device_id *hid); |
358 | 358 | ||
359 | acpi_status | 359 | acpi_status |
360 | acpi_ut_execute_CID(struct acpi_namespace_node *device_node, | 360 | acpi_ut_execute_CID(struct acpi_namespace_node *device_node, |
@@ -366,7 +366,7 @@ acpi_ut_execute_STA(struct acpi_namespace_node *device_node, | |||
366 | 366 | ||
367 | acpi_status | 367 | acpi_status |
368 | acpi_ut_execute_UID(struct acpi_namespace_node *device_node, | 368 | acpi_ut_execute_UID(struct acpi_namespace_node *device_node, |
369 | struct acpi_device_id *uid); | 369 | struct acpica_device_id *uid); |
370 | 370 | ||
371 | acpi_status | 371 | acpi_status |
372 | acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest); | 372 | acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest); |
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 449f3f272e07..125179adf044 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h | |||
@@ -121,19 +121,6 @@ static inline void acpi_disable_pci(void) | |||
121 | } | 121 | } |
122 | extern int acpi_irq_balance_set(char *str); | 122 | extern int acpi_irq_balance_set(char *str); |
123 | 123 | ||
124 | #else /* !CONFIG_ACPI */ | ||
125 | |||
126 | #define acpi_lapic 0 | ||
127 | #define acpi_ioapic 0 | ||
128 | static inline void acpi_noirq_set(void) { } | ||
129 | static inline void acpi_disable_pci(void) { } | ||
130 | static inline void disable_acpi(void) { } | ||
131 | |||
132 | #endif /* !CONFIG_ACPI */ | ||
133 | |||
134 | |||
135 | #ifdef CONFIG_ACPI_SLEEP | ||
136 | |||
137 | /* routines for saving/restoring kernel state */ | 124 | /* routines for saving/restoring kernel state */ |
138 | extern int acpi_save_state_mem(void); | 125 | extern int acpi_save_state_mem(void); |
139 | extern void acpi_restore_state_mem(void); | 126 | extern void acpi_restore_state_mem(void); |
@@ -143,7 +130,15 @@ extern unsigned long acpi_wakeup_address; | |||
143 | /* early initialization routine */ | 130 | /* early initialization routine */ |
144 | extern void acpi_reserve_bootmem(void); | 131 | extern void acpi_reserve_bootmem(void); |
145 | 132 | ||
146 | #endif /*CONFIG_ACPI_SLEEP*/ | 133 | #else /* !CONFIG_ACPI */ |
134 | |||
135 | #define acpi_lapic 0 | ||
136 | #define acpi_ioapic 0 | ||
137 | static inline void acpi_noirq_set(void) { } | ||
138 | static inline void acpi_disable_pci(void) { } | ||
139 | static inline void disable_acpi(void) { } | ||
140 | |||
141 | #endif /* !CONFIG_ACPI */ | ||
147 | 142 | ||
148 | #define ARCH_HAS_POWER_INIT 1 | 143 | #define ARCH_HAS_POWER_INIT 1 |
149 | 144 | ||
diff --git a/include/asm-i386/bootparam.h b/include/asm-i386/bootparam.h index 427d8652bfde..b91b01783e4b 100644 --- a/include/asm-i386/bootparam.h +++ b/include/asm-i386/bootparam.h | |||
@@ -4,8 +4,9 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/screen_info.h> | 5 | #include <linux/screen_info.h> |
6 | #include <linux/apm_bios.h> | 6 | #include <linux/apm_bios.h> |
7 | #include <asm/e820.h> | ||
8 | #include <linux/edd.h> | 7 | #include <linux/edd.h> |
8 | #include <asm/e820.h> | ||
9 | #include <asm/ist.h> | ||
9 | #include <video/edid.h> | 10 | #include <video/edid.h> |
10 | 11 | ||
11 | struct setup_header { | 12 | struct setup_header { |
@@ -48,9 +49,9 @@ struct efi_info { | |||
48 | u32 _pad1; | 49 | u32 _pad1; |
49 | u32 efi_systab; | 50 | u32 efi_systab; |
50 | u32 efi_memdesc_size; | 51 | u32 efi_memdesc_size; |
51 | u32 efi_memdec_version; | 52 | u32 efi_memdesc_version; |
52 | u32 efi_memmap; | 53 | u32 efi_memmap; |
53 | u32 fi_memmap_size; | 54 | u32 efi_memmap_size; |
54 | u32 _pad2[2]; | 55 | u32 _pad2[2]; |
55 | }; | 56 | }; |
56 | 57 | ||
@@ -59,7 +60,7 @@ struct boot_params { | |||
59 | struct screen_info screen_info; /* 0x000 */ | 60 | struct screen_info screen_info; /* 0x000 */ |
60 | struct apm_bios_info apm_bios_info; /* 0x040 */ | 61 | struct apm_bios_info apm_bios_info; /* 0x040 */ |
61 | u8 _pad2[12]; /* 0x054 */ | 62 | u8 _pad2[12]; /* 0x054 */ |
62 | u32 speedstep_info[4]; /* 0x060 */ | 63 | struct ist_info ist_info; /* 0x060 */ |
63 | u8 _pad3[16]; /* 0x070 */ | 64 | u8 _pad3[16]; /* 0x070 */ |
64 | u8 hd0_info[16]; /* obsolete! */ /* 0x080 */ | 65 | u8 hd0_info[16]; /* obsolete! */ /* 0x080 */ |
65 | u8 hd1_info[16]; /* obsolete! */ /* 0x090 */ | 66 | u8 hd1_info[16]; /* obsolete! */ /* 0x090 */ |
diff --git a/include/asm-i386/ist.h b/include/asm-i386/ist.h index d13d1e68afa9..ef2003ebc6f9 100644 --- a/include/asm-i386/ist.h +++ b/include/asm-i386/ist.h | |||
@@ -19,11 +19,13 @@ | |||
19 | 19 | ||
20 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
21 | 21 | ||
22 | #include <linux/types.h> | ||
23 | |||
22 | struct ist_info { | 24 | struct ist_info { |
23 | unsigned long signature; | 25 | u32 signature; |
24 | unsigned long command; | 26 | u32 command; |
25 | unsigned long event; | 27 | u32 event; |
26 | unsigned long perf_level; | 28 | u32 perf_level; |
27 | }; | 29 | }; |
28 | 30 | ||
29 | extern struct ist_info ist_info; | 31 | extern struct ist_info ist_info; |
diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h index 8dbaafe611ff..a2520732ffd6 100644 --- a/include/asm-i386/suspend.h +++ b/include/asm-i386/suspend.h | |||
@@ -21,7 +21,7 @@ struct saved_context { | |||
21 | unsigned long return_address; | 21 | unsigned long return_address; |
22 | } __attribute__((packed)); | 22 | } __attribute__((packed)); |
23 | 23 | ||
24 | #ifdef CONFIG_ACPI_SLEEP | 24 | #ifdef CONFIG_ACPI |
25 | extern unsigned long saved_eip; | 25 | extern unsigned long saved_eip; |
26 | extern unsigned long saved_esp; | 26 | extern unsigned long saved_esp; |
27 | extern unsigned long saved_ebp; | 27 | extern unsigned long saved_ebp; |
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h index 5b526357d178..49730ffbbae4 100644 --- a/include/asm-ia64/acpi.h +++ b/include/asm-ia64/acpi.h | |||
@@ -100,6 +100,11 @@ const char *acpi_get_sysname (void); | |||
100 | int acpi_request_vector (u32 int_type); | 100 | int acpi_request_vector (u32 int_type); |
101 | int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); | 101 | int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); |
102 | 102 | ||
103 | /* routines for saving/restoring kernel state */ | ||
104 | extern int acpi_save_state_mem(void); | ||
105 | extern void acpi_restore_state_mem(void); | ||
106 | extern unsigned long acpi_wakeup_address; | ||
107 | |||
103 | /* | 108 | /* |
104 | * Record the cpei override flag and current logical cpu. This is | 109 | * Record the cpei override flag and current logical cpu. This is |
105 | * useful for CPU removal. | 110 | * useful for CPU removal. |
diff --git a/include/asm-m68knommu/hw_irq.h b/include/asm-m68knommu/hw_irq.h new file mode 100644 index 000000000000..f3ec9e5ae049 --- /dev/null +++ b/include/asm-m68knommu/hw_irq.h | |||
@@ -0,0 +1,4 @@ | |||
1 | #ifndef __M68KNOMMU_HW_IRQ_H__ | ||
2 | #define __M68KNOMMU_HW_IRQ_H__ | ||
3 | |||
4 | #endif /* __M68KNOMMU_HW_IRQ_H__ */ | ||
diff --git a/include/asm-m68knommu/mcfdma.h b/include/asm-m68knommu/mcfdma.h index ea729e81a6be..705c52c79cd8 100644 --- a/include/asm-m68knommu/mcfdma.h +++ b/include/asm-m68knommu/mcfdma.h | |||
@@ -133,7 +133,7 @@ | |||
133 | #define MCFDMA_DIR_ASCEN 0x0800 /* Address Sequence Complete (Completion) interrupt enable */ | 133 | #define MCFDMA_DIR_ASCEN 0x0800 /* Address Sequence Complete (Completion) interrupt enable */ |
134 | #define MCFDMA_DIR_TEEN 0x0200 /* Transfer Error interrupt enable */ | 134 | #define MCFDMA_DIR_TEEN 0x0200 /* Transfer Error interrupt enable */ |
135 | #define MCFDMA_DIR_TCEN 0x0100 /* Transfer Complete (a bus transfer, that is) interrupt enable */ | 135 | #define MCFDMA_DIR_TCEN 0x0100 /* Transfer Complete (a bus transfer, that is) interrupt enable */ |
136 | #define MCFDMA_DIR_INV 0x1000 /* Invalid Combination */ | 136 | #define MCFDMA_DIR_INV 0x0010 /* Invalid Combination */ |
137 | #define MCFDMA_DIR_ASC 0x0008 /* Address Sequence Complete (DMA Completion) */ | 137 | #define MCFDMA_DIR_ASC 0x0008 /* Address Sequence Complete (DMA Completion) */ |
138 | #define MCFDMA_DIR_TE 0x0002 /* Transfer Error */ | 138 | #define MCFDMA_DIR_TE 0x0002 /* Transfer Error */ |
139 | #define MCFDMA_DIR_TC 0x0001 /* Transfer Complete */ | 139 | #define MCFDMA_DIR_TC 0x0001 /* Transfer Complete */ |
diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h index 5e5ed18bb78f..5da43a5d12a3 100644 --- a/include/asm-m68knommu/system.h +++ b/include/asm-m68knommu/system.h | |||
@@ -296,7 +296,7 @@ cmpxchg(volatile int *p, int old, int new) | |||
296 | ({ \ | 296 | ({ \ |
297 | unsigned char volatile *reset; \ | 297 | unsigned char volatile *reset; \ |
298 | asm("move.w #0x2700, %sr"); \ | 298 | asm("move.w #0x2700, %sr"); \ |
299 | reset = ((volatile unsigned short *)(MCF_IPSBAR + 0x110000)); \ | 299 | reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000)); \ |
300 | while(1) \ | 300 | while(1) \ |
301 | *reset |= (0x01 << 7);\ | 301 | *reset |= (0x01 << 7);\ |
302 | }) | 302 | }) |
@@ -318,7 +318,7 @@ cmpxchg(volatile int *p, int old, int new) | |||
318 | ({ \ | 318 | ({ \ |
319 | unsigned char volatile *reset; \ | 319 | unsigned char volatile *reset; \ |
320 | asm("move.w #0x2700, %sr"); \ | 320 | asm("move.w #0x2700, %sr"); \ |
321 | reset = ((volatile unsigned short *)(MCF_IPSBAR + 0xA0000)); \ | 321 | reset = ((volatile unsigned char *)(MCF_IPSBAR + 0xA0000)); \ |
322 | while(1) \ | 322 | while(1) \ |
323 | *reset |= 0x80; \ | 323 | *reset |= 0x80; \ |
324 | }) | 324 | }) |
diff --git a/include/asm-m68knommu/timex.h b/include/asm-m68knommu/timex.h index 85069998db52..109050f3fe91 100644 --- a/include/asm-m68knommu/timex.h +++ b/include/asm-m68knommu/timex.h | |||
@@ -1 +1,23 @@ | |||
1 | #include <asm-m68k/timex.h> | 1 | /* |
2 | * linux/include/asm-m68knommu/timex.h | ||
3 | * | ||
4 | * m68knommu architecture timex specifications | ||
5 | */ | ||
6 | #ifndef _ASM_M68KNOMMU_TIMEX_H | ||
7 | #define _ASM_M68KNOMMU_TIMEX_H | ||
8 | |||
9 | #ifdef CONFIG_COLDFIRE | ||
10 | #include <asm/coldfire.h> | ||
11 | #define CLOCK_TICK_RATE MCF_CLK | ||
12 | #else | ||
13 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ | ||
14 | #endif | ||
15 | |||
16 | typedef unsigned long cycles_t; | ||
17 | |||
18 | static inline cycles_t get_cycles(void) | ||
19 | { | ||
20 | return 0; | ||
21 | } | ||
22 | |||
23 | #endif | ||
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h index 1da8f49c0fe2..98173357dd89 100644 --- a/include/asm-x86_64/acpi.h +++ b/include/asm-x86_64/acpi.h | |||
@@ -108,6 +108,15 @@ static inline void acpi_disable_pci(void) | |||
108 | } | 108 | } |
109 | extern int acpi_irq_balance_set(char *str); | 109 | extern int acpi_irq_balance_set(char *str); |
110 | 110 | ||
111 | /* routines for saving/restoring kernel state */ | ||
112 | extern int acpi_save_state_mem(void); | ||
113 | extern void acpi_restore_state_mem(void); | ||
114 | |||
115 | extern unsigned long acpi_wakeup_address; | ||
116 | |||
117 | /* early initialization routine */ | ||
118 | extern void acpi_reserve_bootmem(void); | ||
119 | |||
111 | #else /* !CONFIG_ACPI */ | 120 | #else /* !CONFIG_ACPI */ |
112 | 121 | ||
113 | #define acpi_lapic 0 | 122 | #define acpi_lapic 0 |
@@ -121,19 +130,6 @@ extern int acpi_numa; | |||
121 | extern int acpi_scan_nodes(unsigned long start, unsigned long end); | 130 | extern int acpi_scan_nodes(unsigned long start, unsigned long end); |
122 | #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) | 131 | #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) |
123 | 132 | ||
124 | #ifdef CONFIG_ACPI_SLEEP | ||
125 | |||
126 | /* routines for saving/restoring kernel state */ | ||
127 | extern int acpi_save_state_mem(void); | ||
128 | extern void acpi_restore_state_mem(void); | ||
129 | |||
130 | extern unsigned long acpi_wakeup_address; | ||
131 | |||
132 | /* early initialization routine */ | ||
133 | extern void acpi_reserve_bootmem(void); | ||
134 | |||
135 | #endif /*CONFIG_ACPI_SLEEP*/ | ||
136 | |||
137 | extern int acpi_disabled; | 133 | extern int acpi_disabled; |
138 | extern int acpi_pci_disabled; | 134 | extern int acpi_pci_disabled; |
139 | 135 | ||
diff --git a/include/asm-x86_64/ist.h b/include/asm-x86_64/ist.h new file mode 100644 index 000000000000..338857ecbc68 --- /dev/null +++ b/include/asm-x86_64/ist.h | |||
@@ -0,0 +1 @@ | |||
#include <asm-i386/ist.h> | |||
diff --git a/include/asm-x86_64/suspend.h b/include/asm-x86_64/suspend.h index 9c3f8de90d2d..b897e8cb55fb 100644 --- a/include/asm-x86_64/suspend.h +++ b/include/asm-x86_64/suspend.h | |||
@@ -44,7 +44,6 @@ extern unsigned long saved_context_eflags; | |||
44 | 44 | ||
45 | extern void fix_processor_context(void); | 45 | extern void fix_processor_context(void); |
46 | 46 | ||
47 | #ifdef CONFIG_ACPI_SLEEP | ||
48 | extern unsigned long saved_rip; | 47 | extern unsigned long saved_rip; |
49 | extern unsigned long saved_rsp; | 48 | extern unsigned long saved_rsp; |
50 | extern unsigned long saved_rbp; | 49 | extern unsigned long saved_rbp; |
@@ -54,4 +53,3 @@ extern unsigned long saved_rdi; | |||
54 | 53 | ||
55 | /* routines for saving/restoring kernel state */ | 54 | /* routines for saving/restoring kernel state */ |
56 | extern int acpi_save_state_mem(void); | 55 | extern int acpi_save_state_mem(void); |
57 | #endif | ||
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d5680cd7746a..bf5e0009de75 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -33,6 +33,7 @@ | |||
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | #include <linux/list.h> | 35 | #include <linux/list.h> |
36 | #include <linux/mod_devicetable.h> | ||
36 | 37 | ||
37 | #include <acpi/acpi.h> | 38 | #include <acpi/acpi.h> |
38 | #include <acpi/acpi_bus.h> | 39 | #include <acpi/acpi_bus.h> |
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h index 290aef326812..5f921c84827a 100644 --- a/include/linux/apm_bios.h +++ b/include/linux/apm_bios.h | |||
@@ -21,20 +21,22 @@ typedef unsigned short apm_eventinfo_t; | |||
21 | 21 | ||
22 | #ifdef __KERNEL__ | 22 | #ifdef __KERNEL__ |
23 | 23 | ||
24 | #include <linux/types.h> | ||
25 | |||
24 | #define APM_CS (GDT_ENTRY_APMBIOS_BASE * 8) | 26 | #define APM_CS (GDT_ENTRY_APMBIOS_BASE * 8) |
25 | #define APM_CS_16 (APM_CS + 8) | 27 | #define APM_CS_16 (APM_CS + 8) |
26 | #define APM_DS (APM_CS_16 + 8) | 28 | #define APM_DS (APM_CS_16 + 8) |
27 | 29 | ||
28 | struct apm_bios_info { | 30 | struct apm_bios_info { |
29 | unsigned short version; | 31 | u16 version; |
30 | unsigned short cseg; | 32 | u16 cseg; |
31 | unsigned long offset; | 33 | u32 offset; |
32 | unsigned short cseg_16; | 34 | u16 cseg_16; |
33 | unsigned short dseg; | 35 | u16 dseg; |
34 | unsigned short flags; | 36 | u16 flags; |
35 | unsigned short cseg_len; | 37 | u16 cseg_len; |
36 | unsigned short cseg_16_len; | 38 | u16 cseg_16_len; |
37 | unsigned short dseg_len; | 39 | u16 dseg_len; |
38 | }; | 40 | }; |
39 | 41 | ||
40 | /* Results of APM Installation Check */ | 42 | /* Results of APM Installation Check */ |
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index af04a555b52c..2ada8ee316b3 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -159,6 +159,12 @@ struct ap_device_id { | |||
159 | 159 | ||
160 | #define AP_DEVICE_ID_MATCH_DEVICE_TYPE 0x01 | 160 | #define AP_DEVICE_ID_MATCH_DEVICE_TYPE 0x01 |
161 | 161 | ||
162 | #define ACPI_ID_LEN 9 | ||
163 | |||
164 | struct acpi_device_id { | ||
165 | __u8 id[ACPI_ID_LEN]; | ||
166 | kernel_ulong_t driver_data; | ||
167 | }; | ||
162 | 168 | ||
163 | #define PNP_ID_LEN 8 | 169 | #define PNP_ID_LEN 8 |
164 | #define PNP_MAX_DEVICES 8 | 170 | #define PNP_MAX_DEVICES 8 |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 2a1897e6f937..66edb2293184 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
@@ -335,6 +335,10 @@ struct pnp_protocol { | |||
335 | int (*set)(struct pnp_dev *dev, struct pnp_resource_table *res); | 335 | int (*set)(struct pnp_dev *dev, struct pnp_resource_table *res); |
336 | int (*disable)(struct pnp_dev *dev); | 336 | int (*disable)(struct pnp_dev *dev); |
337 | 337 | ||
338 | /* protocol specific suspend/resume */ | ||
339 | int (*suspend)(struct pnp_dev *dev, pm_message_t state); | ||
340 | int (*resume)(struct pnp_dev *dev); | ||
341 | |||
338 | /* used by pnp layer only (look but don't touch) */ | 342 | /* used by pnp layer only (look but don't touch) */ |
339 | unsigned char number; /* protocol number*/ | 343 | unsigned char number; /* protocol number*/ |
340 | struct device dev; /* link to driver model */ | 344 | struct device dev; /* link to driver model */ |
diff --git a/include/linux/time.h b/include/linux/time.h index e6aea5146e5d..6a5f503b4f1d 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -99,15 +99,11 @@ extern int update_persistent_clock(struct timespec now); | |||
99 | extern int no_sync_cmos_clock __read_mostly; | 99 | extern int no_sync_cmos_clock __read_mostly; |
100 | void timekeeping_init(void); | 100 | void timekeeping_init(void); |
101 | 101 | ||
102 | static inline unsigned long get_seconds(void) | 102 | unsigned long get_seconds(void); |
103 | { | ||
104 | return xtime.tv_sec; | ||
105 | } | ||
106 | |||
107 | struct timespec current_kernel_time(void); | 103 | struct timespec current_kernel_time(void); |
108 | 104 | ||
109 | #define CURRENT_TIME (current_kernel_time()) | 105 | #define CURRENT_TIME (current_kernel_time()) |
110 | #define CURRENT_TIME_SEC ((struct timespec) { xtime.tv_sec, 0 }) | 106 | #define CURRENT_TIME_SEC ((struct timespec) { get_seconds(), 0 }) |
111 | 107 | ||
112 | extern void do_gettimeofday(struct timeval *tv); | 108 | extern void do_gettimeofday(struct timeval *tv); |
113 | extern int do_settimeofday(struct timespec *tv); | 109 | extern int do_settimeofday(struct timespec *tv); |