Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b9c33a7 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[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: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e2d53566

arch/x86_64/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static struct { 
	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;

arch/x86_64/kernel/i8259.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int i8259A_resume(struct sys_device *dev) 
	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;

arch/x86_64/kernel/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1712,7 +1712,7 @@ struct sysfs_ioapic_data { 
};

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;

arch/x86_64/kernel/nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void enable_timer_nmi_watchdog(void) 


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();

arch/x86_64/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ __setup("report_lost_ticks", time_setup); 
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