diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/oprofile | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/cpu_buffer.c | 2 | ||||
| -rw-r--r-- | drivers/oprofile/cpu_buffer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index efcbf4b4579f..2450b3a393ff 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include "buffer_sync.h" | 27 | #include "buffer_sync.h" |
| 28 | #include "oprof.h" | 28 | #include "oprof.h" |
| 29 | 29 | ||
| 30 | DEFINE_PER_CPU_SHARED_ALIGNED(struct oprofile_cpu_buffer, cpu_buffer); | 30 | DEFINE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer); |
| 31 | 31 | ||
| 32 | static void wq_sync_buffer(struct work_struct *work); | 32 | static void wq_sync_buffer(struct work_struct *work); |
| 33 | 33 | ||
diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h index 13588174311d..c3e366b52261 100644 --- a/drivers/oprofile/cpu_buffer.h +++ b/drivers/oprofile/cpu_buffer.h | |||
| @@ -46,7 +46,7 @@ struct oprofile_cpu_buffer { | |||
| 46 | unsigned long sample_invalid_eip; | 46 | unsigned long sample_invalid_eip; |
| 47 | int cpu; | 47 | int cpu; |
| 48 | struct delayed_work work; | 48 | struct delayed_work work; |
| 49 | } ____cacheline_aligned; | 49 | }; |
| 50 | 50 | ||
| 51 | DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer); | 51 | DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer); |
| 52 | 52 | ||