diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/linux/cpu_acct.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/cpu_acct.h')
| -rw-r--r-- | include/linux/cpu_acct.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/cpu_acct.h b/include/linux/cpu_acct.h deleted file mode 100644 index 6b5fd8a66c8d..000000000000 --- a/include/linux/cpu_acct.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | |||
| 2 | #ifndef _LINUX_CPU_ACCT_H | ||
| 3 | #define _LINUX_CPU_ACCT_H | ||
| 4 | |||
| 5 | #include <linux/cgroup.h> | ||
| 6 | #include <asm/cputime.h> | ||
| 7 | |||
| 8 | #ifdef CONFIG_CGROUP_CPUACCT | ||
| 9 | extern void cpuacct_charge(struct task_struct *, cputime_t cputime); | ||
| 10 | #else | ||
| 11 | static void inline cpuacct_charge(struct task_struct *p, cputime_t cputime) {} | ||
| 12 | #endif | ||
| 13 | |||
| 14 | #endif | ||