tree 383f0e5e5f44deedc80a15586dd5cf25bb4db494
parent bf7232b2b6cc5304c46c3602899aee56cf78004e
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:59 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:59 2005
[PATCH] Fix u32 vs. pm_message_t in x86-64
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately that
turned out not to be the case... Here are fixes x86-64.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
apic.c | 2 +-
i8259.c | 2 +-
io_apic.c | 2 +-
nmi.c | 2 +-
time.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Index: arch/x86_64/kernel/apic.c
===================================================================
--- ae0845892ef3e22f77ad0b9029d86a6f11eaca9b/arch/x86_64/kernel/apic.c
(mode:100644 sha1:79c3f30cca20297c20c4d90951cb052d7f5ad345)
+++ 383f0e5e5f44deedc80a15586dd5cf25bb4db494/arch/x86_64/kernel/apic.c
(mode:100644 sha1:b580a9f3af96c1fdeb8ef381cda4f5f2dd660adb)
@@ -457,7 +457,7 @@
unsigned int apic_thmr;
} apic_pm_state;
-static int lapic_suspend(struct sys_device *dev, u32 state)
+static int lapic_suspend(struct sys_device *dev, pm_message_t state)
{
unsigned long flags;
Index: arch/x86_64/kernel/i8259.c
===================================================================
--- ae0845892ef3e22f77ad0b9029d86a6f11eaca9b/arch/x86_64/kernel/i8259.c
(mode:100644 sha1:3663a3db99c761bf21f520fb846e924c4b1157ff)
+++ 383f0e5e5f44deedc80a15586dd5cf25bb4db494/arch/x86_64/kernel/i8259.c
(mode:100644 sha1:40215ea7ba020c98a5443a3ca36cf484f1a5225c)
@@ -409,7 +409,7 @@
return 0;
}
-static int i8259A_suspend(struct sys_device *dev, u32 state)
+static int i8259A_suspend(struct sys_device *dev, pm_message_t state)
{
save_ELCR(irq_trigger);
return 0;
Index: arch/x86_64/kernel/io_apic.c
===================================================================
--- ae0845892ef3e22f77ad0b9029d86a6f11eaca9b/arch/x86_64/kernel/io_apic.c
(mode:100644 sha1:081d2ae48a121455fd638f31fc794f2246f4577a)
+++ 383f0e5e5f44deedc80a15586dd5cf25bb4db494/arch/x86_64/kernel/io_apic.c
(mode:100644 sha1:392834986719c67ea9b6aaf9443b74e101768e90)
@@ -1712,7 +1712,7 @@
};
static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS];
-static int ioapic_suspend(struct sys_device *dev, u32 state)
+static int ioapic_suspend(struct sys_device *dev, pm_message_t state)
{
struct IO_APIC_route_entry *entry;
struct sysfs_ioapic_data *data;
Index: arch/x86_64/kernel/nmi.c
===================================================================
--- ae0845892ef3e22f77ad0b9029d86a6f11eaca9b/arch/x86_64/kernel/nmi.c
(mode:100644 sha1:2e9eca4594e2fca424ec627c04d42940de924375)
+++ 383f0e5e5f44deedc80a15586dd5cf25bb4db494/arch/x86_64/kernel/nmi.c
(mode:100644 sha1:414f5bcef8373adfdc398a0e63fdf23b7205e20f)
@@ -248,7 +248,7 @@
static int nmi_pm_active; /* nmi_active before suspend */
-static int lapic_nmi_suspend(struct sys_device *dev, u32 state)
+static int lapic_nmi_suspend(struct sys_device *dev, pm_message_t state)
{
nmi_pm_active = nmi_active;
disable_lapic_nmi_watchdog();
Index: arch/x86_64/kernel/time.c
===================================================================
--- ae0845892ef3e22f77ad0b9029d86a6f11eaca9b/arch/x86_64/kernel/time.c
(mode:100644 sha1:88975c89ffaa1df6fef0bbb14a8ca6b0b56f611b)
+++ 383f0e5e5f44deedc80a15586dd5cf25bb4db494/arch/x86_64/kernel/time.c
(mode:100644 sha1:b1793ce162ced0426d871a1c0088b3390cf44f4b)
@@ -965,7 +965,7 @@
static long clock_cmos_diff;
static unsigned long sleep_start;
-static int timer_suspend(struct sys_device *dev, u32 state)
+static int timer_suspend(struct sys_device *dev, pm_message_t state)
{
/*
* Estimate time zone so that set_time can update the clock
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
