diff options
| author |   Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/powerpc/platforms | |
| parent | percpu: don't assume existence of cpu0 (diff) | |
| parent | powerpc64: convert to dynamic percpu allocator (diff) | |
| download | linux-dev-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.xz linux-dev-5579fd7e6aed8860ea0c8e3f11897493153b10ad.zip | |
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/ps3/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c index f6e04bcc70ef..51ffde40af2b 100644 --- a/arch/powerpc/platforms/ps3/smp.c +++ b/arch/powerpc/platforms/ps3/smp.c @@ -37,7 +37,7 @@ */ #define MSG_COUNT 4 -static DEFINE_PER_CPU(unsigned int, ps3_ipi_virqs[MSG_COUNT]); +static DEFINE_PER_CPU(unsigned int [MSG_COUNT], ps3_ipi_virqs); static void do_message_pass(int target, int msg) { |