balloon.c (d37a14bb5fed13a52dada3fa9ef4488ac588b35e) | balloon.c (31bc3858ea3ebcc3157b3f5f0e624c5962f5a7a6) |
---|---|
1/****************************************************************************** 2 * Xen balloon driver - enables returning/claiming memory to/from Xen. 3 * 4 * Copyright (c) 2003, B Dragovic 5 * Copyright (c) 2003-2004, M Williamson, K Fraser 6 * Copyright (c) 2005 Dan M. Smith, IBM Corporation 7 * Copyright (c) 2010 Daniel Kiper 8 * --- 324 unchanged lines hidden (view full) --- 333 if (!set_phys_to_machine(pfn + i, INVALID_P2M_ENTRY)) { 334 pr_warn("set_phys_to_machine() failed, no memory added\n"); 335 goto err; 336 } 337 } 338 } 339#endif 340 | 1/****************************************************************************** 2 * Xen balloon driver - enables returning/claiming memory to/from Xen. 3 * 4 * Copyright (c) 2003, B Dragovic 5 * Copyright (c) 2003-2004, M Williamson, K Fraser 6 * Copyright (c) 2005 Dan M. Smith, IBM Corporation 7 * Copyright (c) 2010 Daniel Kiper 8 * --- 324 unchanged lines hidden (view full) --- 333 if (!set_phys_to_machine(pfn + i, INVALID_P2M_ENTRY)) { 334 pr_warn("set_phys_to_machine() failed, no memory added\n"); 335 goto err; 336 } 337 } 338 } 339#endif 340 |
341 rc = add_memory_resource(nid, resource); | 341 rc = add_memory_resource(nid, resource, false); |
342 if (rc) { 343 pr_warn("Cannot add additional memory (%i)\n", rc); 344 goto err; 345 } 346 347 balloon_stats.total_pages += balloon_hotplug; 348 349 return BP_WAIT; --- 408 unchanged lines hidden --- | 342 if (rc) { 343 pr_warn("Cannot add additional memory (%i)\n", rc); 344 goto err; 345 } 346 347 balloon_stats.total_pages += balloon_hotplug; 348 349 return BP_WAIT; --- 408 unchanged lines hidden --- |