diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-02 21:14:02 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-02 21:14:02 +0000 |
| commit | fdea3f84ab2ad172334572350a016acca72039a7 (patch) | |
| tree | bf74a41eeb334cbabae51b99817ab80178b07c35 | |
| parent | dbff0b77ad0ea0d7694d8119618b0c4f1404eb61 (diff) | |
| download | xen-fdea3f84ab2ad172334572350a016acca72039a7.tar.gz xen-fdea3f84ab2ad172334572350a016acca72039a7.tar.bz2 xen-fdea3f84ab2ad172334572350a016acca72039a7.zip | |
bitkeeper revision 1.1159.187.56 (41af859alAU2_flUOUDG6VyGkjJ8Kg)
More balloon fixes.
| -rw-r--r-- | linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c | 23 |
1 files changed, 11 insertions, 12 deletions
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 f914998bfe..ad951fa984 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 @@ -91,7 +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) +#define subsys_initcall(_fn) __initcall(_fn) #endif #define IPRINTK(fmt, args...) \ @@ -300,14 +300,14 @@ static void balloon_ctrlif_rx(ctrl_msg_t *msg, unsigned long id) switch ( msg->subtype ) { case CMSG_MEM_REQUEST_SET: + { + mem_request_t *req = (mem_request_t *)&msg->msg[0]; if ( msg->length != sizeof(mem_request_t) ) goto parse_error; - { - mem_request_t *req = (mem_request_t *)&msg->msg[0]; - set_new_target(req->target); - req->status = 0; - } - break; + set_new_target(req->target); + req->status = 0; + } + break; default: goto parse_error; } @@ -353,12 +353,11 @@ static int balloon_read(char *page, char **start, off_t off, len = sprintf( page, "Current allocation: %8lu kB\n" - "Target allocation: %8lu kB / %8lu kB (actual / requested)\n" - "Unused heap space: %8lu kB / %8lu kB (low-mem / high-mem)\n" + "Requested target: %8lu kB\n" + "Low-mem balloon: %8lu kB\n" + "High-mem balloon: %8lu kB\n" "Xen hard limit: ", - K(current_pages), - K(current_target()), K(target_pages), - K(balloon_low), K(balloon_high)); + K(current_pages), K(target_pages), K(balloon_low), K(balloon_high)); if ( hard_limit != ~0UL ) len += sprintf( |