diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /kernel/profile.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
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); |