debuggers.hg
changeset 3278:0559e0d05589
bitkeeper revision 1.1159.187.53 (41af4581GTHH1sJIbO5TqzuAB2ifOg)
Fix 2.4 build. Minor mods to the balloon driver.
Fix 2.4 build. Minor mods to the balloon driver.
author | kaf24@scramble.cl.cam.ac.uk |
---|---|
date | Thu Dec 02 16:40:33 2004 +0000 (2004-12-02) |
parents | fdd2c0ba9164 |
children | 551306ae7cd0 199e9c5ef609 |
files | linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c |
line diff
1.1 --- a/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile Thu Dec 02 16:17:35 2004 +0000 1.2 +++ b/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile Thu Dec 02 16:40:33 2004 +0000 1.3 @@ -1,3 +1,4 @@ 1.4 O_TARGET := drv.o 1.5 +export-objs := balloon.o 1.6 obj-y := balloon.o 1.7 include $(TOPDIR)/Rules.make
2.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c Thu Dec 02 16:17:35 2004 +0000 2.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c Thu Dec 02 16:40:33 2004 +0000 2.3 @@ -50,8 +50,6 @@ 2.4 #include <asm/tlb.h> 2.5 #include <linux/list.h> 2.6 2.7 -#define MIN_TARGET ((16 << 20) >> PAGE_SHIFT) /* 16MB */ 2.8 - 2.9 static struct proc_dir_entry *balloon_pde; 2.10 2.11 static DECLARE_MUTEX(balloon_mutex); 2.12 @@ -93,6 +91,7 @@ static struct timer_list balloon_timer; 2.13 #define LIST_TO_PAGE(l) ( list_entry(l, struct page, list) ) 2.14 #define UNLIST_PAGE(p) ( list_del(&p->list) ) 2.15 #define pte_offset_kernel pte_offset 2.16 +#define subsys_initcall(_fn) __initcall(fn) 2.17 #endif 2.18 2.19 #define IPRINTK(fmt, args...) \ 2.20 @@ -159,8 +158,6 @@ static unsigned long current_target(void 2.21 unsigned long target = min(target_pages, hard_limit); 2.22 if ( target > (current_pages + balloon_low + balloon_high) ) 2.23 target = current_pages + balloon_low + balloon_high; 2.24 - if ( target < MIN_TARGET ) 2.25 - target = MIN_TARGET; 2.26 return target; 2.27 } 2.28 2.29 @@ -443,7 +440,7 @@ static int __init balloon_init(void) 2.30 return 0; 2.31 } 2.32 2.33 -__initcall(balloon_init); 2.34 +subsys_initcall(balloon_init); 2.35 2.36 void balloon_update_driver_allowance(long delta) 2.37 {