[Xen-ia64-devel] Re: [PATCH] xen: balloon: compilation fix.

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

The lock was renamed to xen_reservation_lock.
Here is the updated patch.

xen: balloon. compilation fix.

balloon driver doesn't link on ia64 as follows.
This patch make it compile for ia64.

> drivers/built-in.o: In function `increase_reservation':
> /linux-2.6/drivers/xen/balloon.c:213: undefined reference to 
> `xen_reservation_lock'
> /linux-2.6/drivers/xen/balloon.c:213: undefined reference to 
> `xen_reservation_lock'
> /linux-2.6/drivers/xen/balloon.c:271: undefined reference to 
> `xen_reservation_lock'
> /linux-2.6/drivers/xen/balloon.c:271: undefined reference to 
> `xen_reservation_lock'
> drivers/built-in.o: In function `decrease_reservation':
> /linux-2.6/drivers/xen/balloon.c:308: undefined reference to 
> `xen_reservation_lock'
> drivers/built-in.o:/linux-2.6/drivers/xen/balloon.c:308: more undefined 
> references to `xen_reservation_lock' follow

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 80c3088472b9 arch/x86/xen/mmu.c
--- a/arch/x86/xen/mmu.c        Fri Oct 10 16:01:03 2008 +0900
+++ b/arch/x86/xen/mmu.c        Fri Oct 10 16:08:34 2008 +0900
@@ -63,13 +63,6 @@
 #include "debugfs.h"
 
 #define MMU_UPDATE_HISTO       30
-
-/*
- * Protects atomic reservation decrease/increase against concurrent increases.
- * Also protects non-atomic updates of current_pages and driver_pages, and
- * balloon lists.
- */
-DEFINE_SPINLOCK(xen_reservation_lock);
 
 #ifdef CONFIG_XEN_DEBUG_FS
 
diff -r 80c3088472b9 drivers/xen/balloon.c
--- a/drivers/xen/balloon.c     Fri Oct 10 16:01:03 2008 +0900
+++ b/drivers/xen/balloon.c     Fri Oct 10 16:08:34 2008 +0900
@@ -84,6 +84,13 @@
 static struct sys_device balloon_sysdev;
 
 static int register_balloon(struct sys_device *sysdev);
+
+/*
+ * Protects atomic reservation decrease/increase against concurrent increases.
+ * Also protects non-atomic updates of current_pages and driver_pages, and
+ * balloon lists.
+ */
+DEFINE_SPINLOCK(xen_reservation_lock);
 
 static struct balloon_stats balloon_stats;
 


On Tue, Oct 07, 2008 at 11:18:23AM +0900, Isaku Yamahata wrote:
> This patch is for the pv_ops patch queue repository.
> Although the repository is just a snapshot and I'm not sure which patch
> is planned to send for the next merge window, I'd like to make them
> compile on ia64 because I'd like to merge the ia64 xen domU patches
> into the upstream.
> 
> 
> xen: balloon. compilation fix.
> 
> balloon driver doesn't link on ia64 as follows.
> This patch make it compile for ia64.
> 
> > drivers/built-in.o: In function `increase_reservation':
> > /linux-2.6/drivers/xen/balloon.c:213: undefined reference to 
> > `reservation_lock'
> > /linux-2.6/drivers/xen/balloon.c:213: undefined reference to 
> > `reservation_lock'
> > /linux-2.6/drivers/xen/balloon.c:271: undefined reference to 
> > `reservation_lock'
> > /linux-2.6/drivers/xen/balloon.c:271: undefined reference to 
> > `reservation_lock'
> > drivers/built-in.o: In function `decrease_reservation':
> > /linux-2.6/drivers/xen/balloon.c:308: undefined reference to 
> > `reservation_lock'
> > drivers/built-in.o:/linux-2.6/drivers/xen/balloon.c:308: more undefined 
> > references to `reservation_lock' follow
> 
> Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
> 
> diff -r 498a474592c7 arch/x86/xen/mmu.c
> --- a/arch/x86/xen/mmu.c      Mon Oct 06 15:54:03 2008 +0900
> +++ b/arch/x86/xen/mmu.c      Mon Oct 06 16:00:50 2008 +0900
> @@ -63,13 +63,6 @@
>  #include "debugfs.h"
>  
>  #define MMU_UPDATE_HISTO     30
> -
> -/*
> - * Protects atomic reservation decrease/increase against concurrent 
> increases.
> - * Also protects non-atomic updates of current_pages and driver_pages, and
> - * balloon lists.
> - */
> -DEFINE_SPINLOCK(reservation_lock);
>  
>  #ifdef CONFIG_XEN_DEBUG_FS
>  
> diff -r 498a474592c7 drivers/xen/balloon.c
> --- a/drivers/xen/balloon.c   Mon Oct 06 15:54:03 2008 +0900
> +++ b/drivers/xen/balloon.c   Mon Oct 06 16:00:50 2008 +0900
> @@ -84,6 +84,13 @@
>  static struct sys_device balloon_sysdev;
>  
>  static int register_balloon(struct sys_device *sysdev);
> +
> +/*
> + * Protects atomic reservation decrease/increase against concurrent 
> increases.
> + * Also protects non-atomic updates of current_pages and driver_pages, and
> + * balloon lists.
> + */
> +DEFINE_SPINLOCK(reservation_lock);
>  
>  static struct balloon_stats balloon_stats;
>  
> 
> 

-- 
yamahata

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