From: Lei Xia <lxia@northwestern.edu>
Date: Fri, 27 Apr 2012 20:00:28 +0000 (-0500)
Subject: Remove Linux header file for newer version of Linux kernel
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=8c465fc25728d9ee50882910bd89b6d30eaf68b4;p=palacios.git

Remove Linux header file for newer version of Linux kernel
Fix for updated PCI register function argument format
---

diff --git a/linux_module/palacios-vnet.c b/linux_module/palacios-vnet.c
index a955379..4aaa8d5 100644
--- a/linux_module/palacios-vnet.c
+++ b/linux_module/palacios-vnet.c
@@ -10,7 +10,6 @@
 #include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <asm/delay.h>
 #include <linux/timer.h>
 
diff --git a/palacios/src/devices/ne2k.c b/palacios/src/devices/ne2k.c
index 3c8fa06..6e09ba8 100644
--- a/palacios/src/devices/ne2k.c
+++ b/palacios/src/devices/ne2k.c
@@ -1088,7 +1088,8 @@ static int ne2k_pci_read(struct guest_info * core,
 
 }
 
-static int pci_config_update(uint_t reg_num, 
+static int pci_config_update(struct pci_device * pci_dev,
+                        uint32_t reg_num,
 			     void * src, 
 			     uint_t length,
 			     void * private_data) {