Hi!
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. [These
patches are independend and change no object code; therefore not
numbered].
Please apply,
Signed-off-by: Pavel Machek <[email protected]>
Pavel
--- clean-cvs/arch/x86_64/kernel/apic.c 2005-03-29 13:29:28.000000000 +0200
+++ linux-cvs/arch/x86_64/kernel/apic.c 2005-03-31 23:54:43.000000000 +0200
@@ -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;
--- clean-cvs/arch/x86_64/kernel/i8259.c 2005-03-31 23:32:33.000000000 +0200
+++ linux-cvs/arch/x86_64/kernel/i8259.c 2005-03-31 23:54:43.000000000 +0200
@@ -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;
--- clean-cvs/arch/x86_64/kernel/io_apic.c 2005-03-29 13:29:28.000000000 +0200
+++ linux-cvs/arch/x86_64/kernel/io_apic.c 2005-03-31 23:54:43.000000000 +0200
@@ -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;
--- clean-cvs/arch/x86_64/kernel/nmi.c 2005-01-31 00:26:51.000000000 +0100
+++ linux-cvs/arch/x86_64/kernel/nmi.c 2005-03-31 23:54:43.000000000 +0200
@@ -254,7 +254,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();
--- clean-cvs/arch/x86_64/kernel/time.c 2005-03-31 23:32:33.000000000 +0200
+++ linux-cvs/arch/x86_64/kernel/time.c 2005-03-31 23:54:43.000000000 +0200
@@ -957,7 +957,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
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
