diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-12 12:17:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 12:17:36 +0200 |
| commit | 6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch) | |
| tree | 93f74ca002f5756c8e157611174f9540b5cf41c0 /drivers/xen | |
| parent | x86/pci: update pirq_enable_irq() to setup io apic routing (diff) | |
| parent | x86: apic: Fixmap apic address even if apic disabled (diff) | |
| download | linux-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.tar.xz linux-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.zip | |
Merge branch 'x86/apic' into irq/numa
Merge reason: both topics modify the APIC code but were able to do it in
parallel so far. An upcoming patch generates a conflict so
merge them to avoid the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/xen')
| -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 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, |