The patch titled
     i386: fix early usage of atomic_add_return and local_add_return on real 
i386
has been added to the -mm tree.  Its filename is
     i386-fix-early-usage-of-atomic_add_return-and.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: i386: fix early usage of atomic_add_return and local_add_return on 
real i386
From: Thomas Gleixner <[EMAIL PROTECTED]>

The check (boot_cpu_data.x86 == 3) in atomic_add_return() and
local_add_return() fails, when those operations are used before
boot_cpu_data is filled in.

Change the check to (boot_cpu_data.x86 <= 3) to fix this.

Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 include/asm-i386/atomic.h |    2 +-
 include/asm-i386/local.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN 
include/asm-i386/atomic.h~i386-fix-early-usage-of-atomic_add_return-and 
include/asm-i386/atomic.h
--- a/include/asm-i386/atomic.h~i386-fix-early-usage-of-atomic_add_return-and
+++ a/include/asm-i386/atomic.h
@@ -182,7 +182,7 @@ static __inline__ int atomic_add_return(
        int __i;
 #ifdef CONFIG_M386
        unsigned long flags;
-       if(unlikely(boot_cpu_data.x86==3))
+       if(unlikely(boot_cpu_data.x86 <= 3))
                goto no_xadd;
 #endif
        /* Modern 486+ processor */
diff -puN 
include/asm-i386/local.h~i386-fix-early-usage-of-atomic_add_return-and 
include/asm-i386/local.h
--- a/include/asm-i386/local.h~i386-fix-early-usage-of-atomic_add_return-and
+++ a/include/asm-i386/local.h
@@ -135,7 +135,7 @@ static __inline__ long local_add_return(
        long __i;
 #ifdef CONFIG_M386
        unsigned long flags;
-       if(unlikely(boot_cpu_data.x86==3))
+       if(unlikely(boot_cpu_data.x86 <= 3))
                goto no_xadd;
 #endif
        /* Modern 486+ processor */
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

ignore-bogus-acpi-info-for-offline-cpus.patch
nohz-rate-limit-the-local-softirq-pending-warning-output.patch
drm-spinlock-initializer-cleanup.patch
s390-spinlock-initializer-cleanup.patch
i386-hpet-check-if-the-counter-works.patch
doc-clocksources.patch
prevent-going-idle-with-softirq-pending.patch
fix-crash-with-irqpoll-due-to-the-irqf_irqpoll-flag.patch
i386-fix-early-usage-of-atomic_add_return-and.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to