summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-06 00:48:03 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-06 00:48:03 +0200
commit899ad580fe93c6d2a9f364fb0329ef2c259ccd1d (patch)
tree29727a0a8543b45b58e44cdd111f7890d6cec0a9 /drivers
parentIgnore madvise(MADV_WILLNEED) for hugetlbfs-backed regions (diff)
parent[IA64] xen_domu_defconfig: fix build issues/warnings (diff)
downloadlinux-899ad580fe93c6d2a9f364fb0329ef2c259ccd1d.tar.xz
linux-899ad580fe93c6d2a9f364fb0329ef2c259ccd1d.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] xen_domu_defconfig: fix build issues/warnings
Diffstat (limited to 'drivers')
-rw-r--r--drivers/xen/balloon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index efa4b363ce72..f5bbd9e83416 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -513,7 +513,8 @@ static ssize_t show_target(struct sys_device *dev, struct sysdev_attribute *attr
char *buf)
{
return sprintf(buf, "%llu\n",
- (u64)balloon_stats.target_pages << PAGE_SHIFT);
+ (unsigned long long)balloon_stats.target_pages
+ << PAGE_SHIFT);
}
static ssize_t store_target(struct sys_device *dev,