From: Pavel Machek <pavel@suse.cz>
To: ak@suse.de, kernel list <linux-kernel@vger.kernel.org>
Subject: Fix u32 vs. pm_message_t in x86-64
Date: Sat, 2 Apr 2005 23:08:09 +0200 [thread overview]
Message-ID: <20050402210809.GA2025@elf.ucw.cz> (raw)
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 <pavel@suse.cz>
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!
reply other threads:[~2005-04-02 21:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050402210809.GA2025@elf.ucw.cz \
--to=pavel@suse.cz \
--cc=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®