diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/powerpc/include/asm/hvcall.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/powerpc/include/asm/hvcall.h')
| -rw-r--r-- | arch/powerpc/include/asm/hvcall.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index 3bf38af7c834..f0275818b95c 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h | |||
| @@ -287,6 +287,8 @@ struct hcall_stats { | |||
| 287 | unsigned long num_calls; /* number of calls (on this CPU) */ | 287 | unsigned long num_calls; /* number of calls (on this CPU) */ |
| 288 | unsigned long tb_total; /* total wall time (mftb) of calls. */ | 288 | unsigned long tb_total; /* total wall time (mftb) of calls. */ |
| 289 | unsigned long purr_total; /* total cpu time (PURR) of calls. */ | 289 | unsigned long purr_total; /* total cpu time (PURR) of calls. */ |
| 290 | unsigned long tb_start; | ||
| 291 | unsigned long purr_start; | ||
| 290 | }; | 292 | }; |
| 291 | #define HCALL_STAT_ARRAY_SIZE ((MAX_HCALL_OPCODE >> 2) + 1) | 293 | #define HCALL_STAT_ARRAY_SIZE ((MAX_HCALL_OPCODE >> 2) + 1) |
| 292 | 294 | ||