diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /kernel/profile.c | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'kernel/profile.c')
| -rw-r--r-- | kernel/profile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index ad8cbb75ffa2..f89248e6d704 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -35,11 +35,11 @@ struct profile_hit { | |||
| 35 | #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ) | 35 | #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ) |
| 36 | 36 | ||
| 37 | /* Oprofile timer tick hook */ | 37 | /* Oprofile timer tick hook */ |
| 38 | int (*timer_hook)(struct pt_regs *); | 38 | int (*timer_hook)(struct pt_regs *) __read_mostly; |
| 39 | 39 | ||
| 40 | static atomic_t *prof_buffer; | 40 | static atomic_t *prof_buffer; |
| 41 | static unsigned long prof_len, prof_shift; | 41 | static unsigned long prof_len, prof_shift; |
| 42 | static int prof_on; | 42 | static int prof_on __read_mostly; |
| 43 | static cpumask_t prof_cpu_mask = CPU_MASK_ALL; | 43 | static cpumask_t prof_cpu_mask = CPU_MASK_ALL; |
| 44 | #ifdef CONFIG_SMP | 44 | #ifdef CONFIG_SMP |
| 45 | static DEFINE_PER_CPU(struct profile_hit *[2], cpu_profile_hits); | 45 | static DEFINE_PER_CPU(struct profile_hit *[2], cpu_profile_hits); |