tree fab311f6e4cfa969630e008ce63e45554a96df07
parent e2d53566a757c8d12246d8daf8c5a2f21a0c4293
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:31 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:31 -0700
[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]>
x86_64/kernel/apic.c | 2 +-
x86_64/kernel/i8259.c | 2 +-
x86_64/kernel/io_apic.c | 2 +-
x86_64/kernel/nmi.c | 2 +-
x86_64/kernel/time.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Index: arch/x86_64/kernel/apic.c
===================================================================
--- 647d7fa2a0e9230f1253a04efd07a3d01a7bf785/arch/x86_64/kernel/apic.c
(mode:100644 sha1:9826f03dc9a32916308792563fbf7dc5e2d3a3cc)
+++ fab311f6e4cfa969630e008ce63e45554a96df07/arch/x86_64/kernel/apic.c
(mode:100644 sha1:7e13545748e0ef3378c87a23c401ba25f34d6c65)
@@ -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
===================================================================
--- 647d7fa2a0e9230f1253a04efd07a3d01a7bf785/arch/x86_64/kernel/i8259.c
(mode:100644 sha1:d527012460100b5f449fde45b904cc9c3113acad)
+++ fab311f6e4cfa969630e008ce63e45554a96df07/arch/x86_64/kernel/i8259.c
(mode:100644 sha1:7873d9ba88146b5fc2231ccc62b5970ccf6ea656)
@@ -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
===================================================================
--- 647d7fa2a0e9230f1253a04efd07a3d01a7bf785/arch/x86_64/kernel/io_apic.c
(mode:100644 sha1:adebe70c180ec64358039beafbfc0af587a89955)
+++ fab311f6e4cfa969630e008ce63e45554a96df07/arch/x86_64/kernel/io_apic.c
(mode:100644 sha1:29a257295484ee01c16d0ebdf1bfdbe2caeeb1d3)
@@ -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
===================================================================
--- 647d7fa2a0e9230f1253a04efd07a3d01a7bf785/arch/x86_64/kernel/nmi.c
(mode:100644 sha1:72f40ca4f06b827215beaeba48e94d9898938636)
+++ fab311f6e4cfa969630e008ce63e45554a96df07/arch/x86_64/kernel/nmi.c
(mode:100644 sha1:e00d4adec36bd22619a348af72242bf06d4204c7)
@@ -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
===================================================================
--- 647d7fa2a0e9230f1253a04efd07a3d01a7bf785/arch/x86_64/kernel/time.c
(mode:100644 sha1:943a9bfba2090d570ebbfabcc0099510ffa09679)
+++ fab311f6e4cfa969630e008ce63e45554a96df07/arch/x86_64/kernel/time.c
(mode:100644 sha1:0e3b60e1ac5b54f60d4a2a7cff4492c8ddef9774)
@@ -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
