diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 18:48:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 18:48:03 -0400 |
| commit | 899ad580fe93c6d2a9f364fb0329ef2c259ccd1d (patch) | |
| tree | 29727a0a8543b45b58e44cdd111f7890d6cec0a9 /drivers | |
| parent | a425a638c858fd10370b573bde81df3ba500e271 (diff) | |
| parent | 0692698cb7369ea1ce74f3f87f70baf5072f8a37 (diff) | |
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.c | 3 |
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 | |||
| 513 | char *buf) | 513 | char *buf) |
| 514 | { | 514 | { |
| 515 | return sprintf(buf, "%llu\n", | 515 | return sprintf(buf, "%llu\n", |
| 516 | (u64)balloon_stats.target_pages << PAGE_SHIFT); | 516 | (unsigned long long)balloon_stats.target_pages |
| 517 | << PAGE_SHIFT); | ||
| 517 | } | 518 | } |
| 518 | 519 | ||
| 519 | static ssize_t store_target(struct sys_device *dev, | 520 | static ssize_t store_target(struct sys_device *dev, |