]> git.baikalelectronics.ru Git - kernel.git/commit
alpha: unbreak percpu again
authorTejun Heo <tj@kernel.org>
Tue, 12 May 2009 20:19:39 +0000 (13:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 May 2009 21:11:35 +0000 (14:11 -0700)
commita3da3a7a0f3189b1f6f381b52ae8608324969442
treeb68726c758a02316c0e42dd934d4e1b789ad034b
parent091b83d2e88c8e723efd7986cc8b0ddbee6da662
alpha: unbreak percpu again

Commit 09c0060fdb5a89de3c7351c212a528738ba1a979 ("FRV: Fix the section
attribute on UP DECLARE_PER_CPU()") cleaned up DECLARE/DEFINE_PER_CPU()
macros and in the process made alpha percpu.h include
include/asm-generic/percpu.h which breaks compilation due to duplicate
definitions.

Remove inclusion of generic asm helper file and define whatever necessary
in alpha header proper.

In the longer term, percpu definitions will be unified and all these
little subtlties will be removed.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: David Howells <dhowells@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/alpha/include/asm/percpu.h