summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/init.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-04-01 21:14:04 +0200
committerIngo Molnar <mingo@elte.hu>2011-04-01 21:14:04 +0200
commit5679027e74126e0dfc860869b0e7ceab1dd06318 (patch)
tree9a18b1a2f53be3bad8c9e4db01617fb51f067f64 /arch/arm/plat-samsung/init.c
parentWARN_ON_SMP(): Add comment to explain ({0;}) (diff)
parentrcu: create new rcu_access_index() and use in mce (diff)
downloadlinux-5679027e74126e0dfc860869b0e7ceab1dd06318.tar.xz
linux-5679027e74126e0dfc860869b0e7ceab1dd06318.zip
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'arch/arm/plat-samsung/init.c')
-rw-r--r--arch/arm/plat-samsung/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
index 6790edfaca6f..79d10fca9090 100644
--- a/arch/arm/plat-samsung/init.c
+++ b/arch/arm/plat-samsung/init.c
@@ -36,7 +36,7 @@ static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode,
unsigned int count)
{
for (; count != 0; count--, tab++) {
- if ((idcode & tab->idmask) == tab->idcode)
+ if ((idcode & tab->idmask) == (tab->idcode & tab->idmask))
return tab;
}