summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2009-01-15 15:16:55 +0900
committerTony Luck <tony.luck@intel.com>2009-01-15 09:43:24 -0800
commit7a0b6e01434f77194b86c8051b4c3718da636c64 (patch)
treee9d412faddabd370426d2f8229d6c84ddf2b48e2 /arch
parent5393f780277165f282a37ed82dd878159ec9dad5 (diff)
downloadlinux-3.10-7a0b6e01434f77194b86c8051b4c3718da636c64.tar.gz
linux-3.10-7a0b6e01434f77194b86c8051b4c3718da636c64.tar.bz2
linux-3.10-7a0b6e01434f77194b86c8051b4c3718da636c64.zip
[IA64] Update to use account_{steal,idle}_ticks
This patch fixes the following errors caused by 79741dd35713ff4f6fd0eafd59fa94e8a4ba922d which changed the prototypes of account_steal_time() and account_idle_time(). > CC arch/ia64/xen/time.o > arch/ia64/xen/time.c: In function 'consider_steal_time': > arch/ia64/xen/time.c:132: warning: passing argument 1 of 'account_steal_time' makes integer from pointer without a cast > arch/ia64/xen/time.c:132: error: too many arguments to function 'account_steal_time' > arch/ia64/xen/time.c:133: warning: passing argument 1 of 'account_steal_time' makes integer from pointer without a cast > arch/ia64/xen/time.c:133: error: too many arguments to function 'account_steal_time' Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/xen/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/xen/time.c b/arch/ia64/xen/time.c
index d15a94c330f..68d6204c3f1 100644
--- a/arch/ia64/xen/time.c
+++ b/arch/ia64/xen/time.c
@@ -129,8 +129,8 @@ consider_steal_time(unsigned long new_itm)
blocked = stolentick;
if (stolen > 0 || blocked > 0) {
- account_steal_time(NULL, jiffies_to_cputime(stolen));
- account_steal_time(idle_task(cpu), jiffies_to_cputime(blocked));
+ account_steal_ticks(stolen);
+ account_idle_ticks(blocked);
run_local_timers();
if (rcu_pending(cpu))