Dmitry Torokhov
55adaa495e
vmware balloon: clamp number of collected non-balloonable pages ...
Limit number of accumulated non-balloonable pages during inflation cycle,
otherwise there is a chance we will be spinning and growing the list
forever. This happens during torture tests when balloon target changes
while we are in the middle of inflation cycle and monitor starts refusing
to lock pages (since they are not needed anymore).
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
Acked-by: Bhavesh Davda <bhavesh@vmware.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-06-04 15:21:44 -07:00
Merge branch 'acpi-idle' into release
2010-06-04 15:23:02 -04:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2010-06-03 15:48:15 -07:00
Merge remote branch 'origin' into secretlab/next-devicetree
2010-05-22 00:36:56 -06:00
auxdisplay: section cleanup in cfag12864bfb driver
2010-05-25 08:07:09 -07:00
topology: convert cpu notifier to return encapsulate errno value
2010-05-27 09:12:48 -07:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2010-06-03 15:46:37 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-05-20 21:04:44 -07:00
of: Always use 'struct device.of_node' to get device node pointer.
2010-05-18 16:10:44 -06:00
ramoops: add HAS_IOMEM dependency
2010-06-04 15:21:44 -07:00
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-19 17:10:57 -07:00
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:49:13 -07:00
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2010-05-28 16:14:17 -07:00
crypto: crypto4xx - Fix build breakage
2010-06-03 16:57:24 +10:00
of/dma: fix build breakage in ppc4xx adma driver
2010-06-02 21:02:39 -06:00
of/edac: fix build breakage in drivers
2010-06-02 21:02:41 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2010-05-27 10:22:06 -07:00
sysfs: add struct file* to bin_attr callbacks
2010-05-21 09:37:31 -07:00
gpio: Fix inverted rdc321x gpio data out registers
2010-05-28 01:37:59 +02:00
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2010-06-03 07:19:45 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-05-27 09:19:55 -07:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
powerpc/macio: Fix probing of macio devices by using the right of match table
2010-06-02 17:50:38 +10:00
intel_idle: native hardware cpuidle driver for latest Intel processors
2010-05-28 14:26:20 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2010-05-27 10:22:06 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2010-05-30 09:12:16 -07:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held
2010-06-01 00:26:06 -07:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2010-06-03 15:46:37 -07:00
md: convert cpu notifier to return encapsulate errno value
2010-05-27 09:12:48 -07:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
drivers/message/i2o/i2o_config.c: use memdup_user
2010-05-27 09:12:41 -07:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
vmware balloon: clamp number of collected non-balloonable pages
2010-06-04 15:21:44 -07:00
drivers/mmc/host: use ERR_CAST
2010-05-27 09:12:40 -07:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-06-03 15:44:43 -07:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2010-06-03 15:46:37 -07:00
Merge remote branch 'origin' into secretlab/next-devicetree
2010-05-22 00:36:56 -06:00
m68k: amiga - Parallel port platform device conversion
2010-05-26 19:51:09 +02:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-05-28 14:42:18 -07:00
of/pcmcia: m8xx_pcmcia.c: Fix build failures
2010-06-02 21:02:38 -06:00
intel_scu_ipc: Length fix
2010-06-01 08:40:47 -07:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
rapidio: fix new kernel-doc warnings
2010-05-30 09:02:47 -07:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
rtc: s3c: initialize s3c_rtc_cpu_type before using it
2010-06-04 15:21:44 -07:00
[S390] dasd: unit check handling during internal cio I/O
2010-05-26 23:27:09 +02:00
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
2010-05-24 08:01:10 -07:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2010-06-03 15:48:15 -07:00
powerpc/macio: Fix probing of macio devices by using the right of match table
2010-06-02 17:50:38 +10:00
SFI: do not return freed pointer
2010-06-01 12:04:35 -04:00
of/spi: mpc512x_psc_spi.c: Fix build failures
2010-06-02 13:45:06 -06:00
ssb: fix NULL ptr deref when pcihost_wrapper is used
2010-05-28 13:57:01 -04:00
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
2010-06-03 11:33:58 +02:00
drivers/telephony/ixj.c: use memdup_user
2010-05-27 09:12:42 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-06-04 09:48:03 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-05-28 10:18:40 -07:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-06-03 15:44:43 -07:00
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-05-21 17:22:52 -07:00
sysfs: add struct file* to bin_attr callbacks
2010-05-21 09:37:31 -07:00
of/watchdog: gef_wdt.c: fix build breakage
2010-06-02 21:02:41 -06:00
xen: avoid allocation causing potential swap activity on the resume path
2010-06-03 09:34:45 +01:00
sysfs: add struct file* to bin_attr callbacks
2010-05-21 09:37:31 -07:00
intel_idle: native hardware cpuidle driver for latest Intel processors
2010-05-28 14:26:20 -04:00
55adaa495e