diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 09:17:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 09:17:01 -0700 |
commit | cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea (patch) | |
tree | 0f359975ccad4ac72e86b8edf1924c076e74bd89 /lib/Makefile | |
parent | 98f01720cbe3e2eb719682777049b6514e9db556 (diff) | |
parent | c59bd5688299cddb71183e156e7a3c1409b90df2 (diff) | |
download | kernel_samsung_smdk4412-cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea.tar.gz kernel_samsung_smdk4412-cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea.tar.bz2 kernel_samsung_smdk4412-cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea.zip |
Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hweight: Use a 32-bit popcnt for __arch_hweight32()
arch, hweight: Fix compilation errors
x86: Add optimized popcnt variants
bitops: Optimize hweight() by making use of compile-time evaluation
Diffstat (limited to 'lib/Makefile')
-rw-r--r-- | lib/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index af759f39d4a..9e6d3c29d73 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -39,7 +39,10 @@ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o lib-$(CONFIG_GENERIC_FIND_FIRST_BIT) += find_next_bit.o lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o obj-$(CONFIG_GENERIC_FIND_LAST_BIT) += find_last_bit.o + +CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o + obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o obj-$(CONFIG_BTREE) += btree.o obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o |