diff options
| -rw-r--r-- | arch/x86/xen/mmu.c | 3 | ||||
| -rw-r--r-- | drivers/xen/balloon.c | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 5e92b61ad574..e7c378ec597e 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -78,8 +78,7 @@ | |||
| 78 | 78 | ||
| 79 | /* | 79 | /* |
| 80 | * Protects atomic reservation decrease/increase against concurrent increases. | 80 | * Protects atomic reservation decrease/increase against concurrent increases. |
| 81 | * Also protects non-atomic updates of current_pages and driver_pages, and | 81 | * Also protects non-atomic updates of current_pages and balloon lists. |
| 82 | * balloon lists. | ||
| 83 | */ | 82 | */ |
| 84 | DEFINE_SPINLOCK(xen_reservation_lock); | 83 | DEFINE_SPINLOCK(xen_reservation_lock); |
| 85 | 84 | ||
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 43f9f02c7db0..b4206fd6b1b9 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
| @@ -70,11 +70,6 @@ struct balloon_stats { | |||
| 70 | /* We aim for 'current allocation' == 'target allocation'. */ | 70 | /* We aim for 'current allocation' == 'target allocation'. */ |
| 71 | unsigned long current_pages; | 71 | unsigned long current_pages; |
| 72 | unsigned long target_pages; | 72 | unsigned long target_pages; |
| 73 | /* | ||
| 74 | * Drivers may alter the memory reservation independently, but they | ||
| 75 | * must inform the balloon driver so we avoid hitting the hard limit. | ||
| 76 | */ | ||
| 77 | unsigned long driver_pages; | ||
| 78 | /* Number of pages in high- and low-memory balloons. */ | 73 | /* Number of pages in high- and low-memory balloons. */ |
| 79 | unsigned long balloon_low; | 74 | unsigned long balloon_low; |
| 80 | unsigned long balloon_high; | 75 | unsigned long balloon_high; |
| @@ -404,7 +399,6 @@ static int __init balloon_init(void) | |||
| 404 | balloon_stats.target_pages = balloon_stats.current_pages; | 399 | balloon_stats.target_pages = balloon_stats.current_pages; |
| 405 | balloon_stats.balloon_low = 0; | 400 | balloon_stats.balloon_low = 0; |
| 406 | balloon_stats.balloon_high = 0; | 401 | balloon_stats.balloon_high = 0; |
| 407 | balloon_stats.driver_pages = 0UL; | ||
| 408 | 402 | ||
| 409 | init_timer(&balloon_timer); | 403 | init_timer(&balloon_timer); |
| 410 | balloon_timer.data = 0; | 404 | balloon_timer.data = 0; |
| @@ -462,7 +456,6 @@ module_exit(balloon_exit); | |||
| 462 | BALLOON_SHOW(current_kb, "%lu\n", PAGES2KB(balloon_stats.current_pages)); | 456 | BALLOON_SHOW(current_kb, "%lu\n", PAGES2KB(balloon_stats.current_pages)); |
| 463 | BALLOON_SHOW(low_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_low)); | 457 | BALLOON_SHOW(low_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_low)); |
| 464 | BALLOON_SHOW(high_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_high)); | 458 | BALLOON_SHOW(high_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_high)); |
| 465 | BALLOON_SHOW(driver_kb, "%lu\n", PAGES2KB(balloon_stats.driver_pages)); | ||
| 466 | 459 | ||
| 467 | static ssize_t show_target_kb(struct sys_device *dev, struct sysdev_attribute *attr, | 460 | static ssize_t show_target_kb(struct sys_device *dev, struct sysdev_attribute *attr, |
| 468 | char *buf) | 461 | char *buf) |
| @@ -531,7 +524,6 @@ static struct attribute *balloon_info_attrs[] = { | |||
| 531 | &attr_current_kb.attr, | 524 | &attr_current_kb.attr, |
| 532 | &attr_low_kb.attr, | 525 | &attr_low_kb.attr, |
| 533 | &attr_high_kb.attr, | 526 | &attr_high_kb.attr, |
| 534 | &attr_driver_kb.attr, | ||
| 535 | NULL | 527 | NULL |
| 536 | }; | 528 | }; |
| 537 | 529 | ||
