diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-02 16:40:33 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-02 16:40:33 +0000 |
| commit | b75183d3368f528e118cd983e96f45bfd3dcf776 (patch) | |
| tree | c2a13dc5bdb6c8de86360108b1ee106376cf16d8 | |
| parent | 9d857d771b68128965943035688ea5f1668da797 (diff) | |
| download | xen-b75183d3368f528e118cd983e96f45bfd3dcf776.tar.gz xen-b75183d3368f528e118cd983e96f45bfd3dcf776.tar.bz2 xen-b75183d3368f528e118cd983e96f45bfd3dcf776.zip | |
bitkeeper revision 1.1159.187.53 (41af4581GTHH1sJIbO5TqzuAB2ifOg)
Fix 2.4 build. Minor mods to the balloon driver.
| -rw-r--r-- | linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile | 1 | ||||
| -rw-r--r-- | linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile b/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile index 9fb2227978..c97a95a522 100644 --- a/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile +++ b/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile @@ -1,3 +1,4 @@ O_TARGET := drv.o +export-objs := balloon.o obj-y := balloon.o include $(TOPDIR)/Rules.make diff --git a/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c index 772d52b1ec..f90d8728fd 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c @@ -50,8 +50,6 @@ #include <asm/tlb.h> #include <linux/list.h> -#define MIN_TARGET ((16 << 20) >> PAGE_SHIFT) /* 16MB */ - static struct proc_dir_entry *balloon_pde; static DECLARE_MUTEX(balloon_mutex); @@ -93,6 +91,7 @@ static struct timer_list balloon_timer; #define LIST_TO_PAGE(l) ( list_entry(l, struct page, list) ) #define UNLIST_PAGE(p) ( list_del(&p->list) ) #define pte_offset_kernel pte_offset +#define subsys_initcall(_fn) __initcall(fn) #endif #define IPRINTK(fmt, args...) \ @@ -159,8 +158,6 @@ static unsigned long current_target(void) unsigned long target = min(target_pages, hard_limit); if ( target > (current_pages + balloon_low + balloon_high) ) target = current_pages + balloon_low + balloon_high; - if ( target < MIN_TARGET ) - target = MIN_TARGET; return target; } @@ -443,7 +440,7 @@ static int __init balloon_init(void) return 0; } -__initcall(balloon_init); +subsys_initcall(balloon_init); void balloon_update_driver_allowance(long delta) { |