Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f94d1d3a1df125461a16b2888eca46d64f113e3a
Commit:     f94d1d3a1df125461a16b2888eca46d64f113e3a
Parent:     7b631c2de63b4475351258197409983c8189ed04
Author:     Mathieu Desnoyers <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 7 00:16:18 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 08:42:32 2008 -0800

    Fix m32r __xchg
    
    the #endif  /* CONFIG_SMP */ should cover the default condition, or it may 
cause
    bad parameter to be silently missed.
    
    To make it work correctly, we have to remove the ifdef CONFIG SMP 
surrounding
    __xchg_called_with_bad_pointer declaration. Thanks to Adrian Bunk for 
detecting
    this.
    
    Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
    Acked-by: Hirokazu Takata <[EMAIL PROTECTED]>
    Cc: Adrian Bunk <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/asm-m32r/system.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 7e7eb37..70a57c8 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -127,9 +127,7 @@ static inline void local_irq_disable(void)
        ((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr),    \
                        sizeof(*(ptr))))
 
-#ifdef CONFIG_SMP
 extern void  __xchg_called_with_bad_pointer(void);
-#endif
 
 #ifdef CONFIG_CHIP_M32700_TS1
 #define DCACHE_CLEAR(reg0, reg1, addr)                         \
@@ -189,9 +187,9 @@ __xchg(unsigned long x, volatile void *ptr, int size)
 #endif /* CONFIG_CHIP_M32700_TS1 */
                );
                break;
+#endif  /* CONFIG_SMP */
        default:
                __xchg_called_with_bad_pointer();
-#endif  /* CONFIG_SMP */
        }
 
        local_irq_restore(flags);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to