Skip to contentSkip to conversation

64bit warning fixes

PATCH New Andi Kleen 1 participant 1 message Feb 7, 2002

Subsystems (3)
Suspend to RAM Hibernation Power management core
lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 64bit warning fixes

Hi Linus,

This patch just fixes some harmless but ugly warnings on 64bit compilations.

Quoted 1 line

From the x86-64 tree.

For 2.5.4pre2. Please consider applying.

Thanks,

-Andi

include/linux/pm.h renamed from ../v2.5/linux/include/linux/pm.h +2 -2
@@ -103,8 +103,8 @@
 	void		*data;
 
 	unsigned long	 flags;
-	int		 state;
-	int		 prev_state;
+	unsigned long	 state;
+	unsigned long	 prev_state;
 
 	struct list_head entry;
 };
kernel/pm.c renamed from ../v2.5/linux/kernel/pm.c +2 -2
@@ -154,7 +154,7 @@
 int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data)
 {
 	int status = 0;
-	int prev_state, next_state;
+	unsigned long prev_state, next_state;
 
 	if (in_interrupt())
 		BUG();

@@ -163,7 +163,7 @@
 	case PM_SUSPEND:
 	case PM_RESUME:
 		prev_state = dev->state;
-		next_state = (int) data;
+		next_state = (unsigned long) data;
 		if (prev_state != next_state) {
 			if (dev->callback)
 				status = (*dev->callback)(dev, rqst, data);