diff options
| author | Trond Myklebust <trond.myklebust@fys.uio.no> | 2004-03-13 13:01:02 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@fys.uio.no> | 2004-03-13 13:01:02 -0500 |
| commit | b67cfdb82691739b504b2881f9c949674dfec745 (patch) | |
| tree | 2bb3e8318ed0d28b5ef16829b9d7eb7bb03effd3 /include/linux | |
| parent | b8ddcbf2084998ba3f873aa33d371bc6bb111ee9 (diff) | |
| parent | e214725f749c1ca58ac87bcebb23d5c06170e62d (diff) | |
Merge http://nfsclient.bkbits.net/linux-2.5
into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kernel_stat.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 17a9656a31fb..4594ccc4a7c1 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -14,13 +14,13 @@ */ struct cpu_usage_stat { - unsigned int user; - unsigned int nice; - unsigned int system; - unsigned int softirq; - unsigned int irq; - unsigned int idle; - unsigned int iowait; + u64 user; + u64 nice; + u64 system; + u64 softirq; + u64 irq; + u64 idle; + u64 iowait; }; struct kernel_stat { @@ -34,7 +34,7 @@ DECLARE_PER_CPU(struct kernel_stat, kstat); /* Must have preemption disabled for this to be meaningful. */ #define kstat_this_cpu __get_cpu_var(kstat) -extern unsigned long nr_context_switches(void); +extern unsigned long long nr_context_switches(void); /* * Number of interrupts per specific IRQ source, since bootup |