[PATCH 2/2][linux-2.6.18-xen][PV-on-HVM] Fix compile errors for RHEL/SLES

[Ben Guthro <bguthro@virtualiron.com>]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

Change unsigned to unsigned long for spinlock flags.
This avoids x86_64 assembly error in some distros (SLES10)

Signed-off-by: Ben Guthro <bguthro@virtualiron.com>

[-- Attachment #2: linux-gos-fixes.patch --]
[-- Type: text/x-patch, Size: 3825 bytes --]

diff -r 68113a19b00b drivers/xen/netfront/accel.c
--- a/drivers/xen/netfront/accel.c	Fri Nov 30 13:37:19 2007 -0500
+++ b/drivers/xen/netfront/accel.c	Mon Dec 03 14:27:51 2007 -0500
@@ -66,7 +66,7 @@ void netif_exit_accel(void)
 void netif_exit_accel(void)
 {
 	struct netfront_accelerator *accelerator, *tmp;
-	unsigned flags;
+	unsigned long flags;
 
 	spin_lock_irqsave(&accelerators_lock, flags);
 
@@ -115,7 +115,7 @@ static void add_accelerator_vif(struct n
 static void add_accelerator_vif(struct netfront_accelerator *accelerator,
 				struct netfront_info *np)
 {
-	unsigned flags;
+	unsigned long flags;
 
 	/* Need lock to write list */
 	spin_lock_irqsave(&accelerator->vif_states_lock, flags);
@@ -232,7 +232,7 @@ int netfront_load_accelerator(struct net
 {
 	struct netfront_accelerator *accelerator;
 	int rc = 0;
-	unsigned flags;
+	unsigned long flags;
 
 	DPRINTK(" %s\n", frontend);
 
@@ -331,7 +331,7 @@ int netfront_accelerator_loaded(int vers
 				struct netfront_accel_hooks *hooks)
 {
 	struct netfront_accelerator *accelerator;
-	unsigned flags;
+	unsigned long flags;
 
 	if (version != NETFRONT_ACCEL_VERSION) {
 		if (version > NETFRONT_ACCEL_VERSION) {
@@ -394,7 +394,7 @@ void netfront_accelerator_ready(const ch
 {
 	struct netfront_accelerator *accelerator;
 	struct netfront_accel_vif_state *accel_vif_state;
-	unsigned flags, flags1;
+	unsigned long flags, flags1;
 
 	DPRINTK("%s %p\n", frontend, dev);
 
@@ -457,7 +457,7 @@ static void accelerator_remove_hooks(str
 {
 	struct netfront_accel_hooks *hooks;
 	struct netfront_accel_vif_state *vif_state, *tmp;
-	unsigned flags;
+	unsigned long flags;
 
 	/* Mutex is held so don't need vif_states_lock to iterate list */
 	list_for_each_entry_safe(vif_state, tmp,
@@ -491,7 +491,7 @@ void netfront_accelerator_stop(const cha
 void netfront_accelerator_stop(const char *frontend)
 {
 	struct netfront_accelerator *accelerator;
-	unsigned flags;
+	unsigned long flags;
 
 	mutex_lock(&accelerator_mutex);
 	spin_lock_irqsave(&accelerators_lock, flags);
@@ -514,7 +514,7 @@ EXPORT_SYMBOL_GPL(netfront_accelerator_s
 
 /* Helper for call_remove and do_suspend */
 static int do_remove(struct netfront_info *np, struct xenbus_device *dev,
-		     unsigned *lock_flags)
+		     unsigned long *lock_flags)
 {
 	struct netfront_accelerator *accelerator = np->accelerator;
  	struct netfront_accel_hooks *hooks;
@@ -553,7 +553,7 @@ int netfront_accelerator_call_remove(str
 {
 	struct netfront_accelerator *accelerator;
  	struct netfront_accel_vif_state *tmp_vif_state;
-  	unsigned flags;
+  	unsigned long flags;
 	int rc = 0; 
 
 	mutex_lock(&accelerator_mutex);
@@ -588,7 +588,7 @@ int netfront_accelerator_suspend(struct 
 int netfront_accelerator_suspend(struct netfront_info *np,
  				 struct xenbus_device *dev)
 {
-	unsigned flags;
+	unsigned long flags;
 	int rc = 0;
 
 	mutex_lock(&accelerator_mutex);
@@ -650,7 +650,7 @@ void netfront_accelerator_resume(struct 
 {
  	struct netfront_accel_vif_state *accel_vif_state = NULL;
  	spinlock_t *vif_states_lock;
- 	unsigned flags;
+ 	unsigned long flags;
  
  	mutex_lock(&accelerator_mutex);
 
@@ -693,7 +693,7 @@ int netfront_check_accelerator_queue_rea
 	struct netfront_accelerator *accelerator;
 	struct netfront_accel_hooks *hooks;
 	int rc = 1;
-	unsigned flags;
+	unsigned long flags;
 
 	accelerator = np->accelerator;
 
@@ -715,7 +715,7 @@ void netfront_accelerator_call_stop_napi
 {
 	struct netfront_accelerator *accelerator;
 	struct netfront_accel_hooks *hooks;
-	unsigned flags;
+	unsigned long flags;
 
 	accelerator = np->accelerator;
 
@@ -735,7 +735,7 @@ int netfront_accelerator_call_get_stats(
 {
 	struct netfront_accelerator *accelerator;
 	struct netfront_accel_hooks *hooks;
-	unsigned flags;
+	unsigned long flags;
 	int rc = 0;
 
 	accelerator = np->accelerator;

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel