The patch titled frv: don't make smp_{r, w, }mb() interpolate MEMBAR when CONFIG_SMP=n has been added to the -mm tree. Its filename is frv-dont-make-smp_r-w-mb-interpolate-membar-when-config_smp=n.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** 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 The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: frv: don't make smp_{r, w, }mb() interpolate MEMBAR when CONFIG_SMP=n From: David Howells <dhowells@xxxxxxxxxx> Don't make smp_{r,w,}mb() interpolate a MEMBAR instruction when CONFIG_SMP=n as SMP memory barries on UP systems should interpolate a compiler barrier only. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-frv/system.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff -puN include/asm-frv/system.h~frv-dont-make-smp_r-w-mb-interpolate-membar-when-config_smp=n include/asm-frv/system.h --- a/include/asm-frv/system.h~frv-dont-make-smp_r-w-mb-interpolate-membar-when-config_smp=n +++ a/include/asm-frv/system.h @@ -179,14 +179,23 @@ do { \ #define mb() asm volatile ("membar" : : :"memory") #define rmb() asm volatile ("membar" : : :"memory") #define wmb() asm volatile ("membar" : : :"memory") -#define set_mb(var, value) do { var = value; mb(); } while (0) +#define read_barrier_depends() barrier() -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() - -#define read_barrier_depends() do {} while(0) +#ifdef CONFIG_SMP +#define smp_mb() mb() +#define smp_rmb() rmb() +#define smp_wmb() wmb() #define smp_read_barrier_depends() read_barrier_depends() +#define set_mb(var, value) \ + do { xchg(&var, (value)); } while (0) +#else +#define smp_mb() barrier() +#define smp_rmb() barrier() +#define smp_wmb() barrier() +#define smp_read_barrier_depends() do {} while(0) +#define set_mb(var, value) \ + do { var = (value); barrier(); } while (0) +#endif #define HARD_RESET_NOW() \ do { \ _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are origin.patch git-unionfs.patch frv-handle-update_mmu_cache-being-called-when-current-mm-is-null.patch frv-move-stack_top_max-up.patch frv-add-support-for-emulation-of-userspace-atomic-ops.patch frv-make-nommu-mode-work-with-base-addresses-other-than-0xc0000000.patch frv-dont-make-smp_r-w-mb-interpolate-membar-when-config_smp=n.patch remove-the-macro-get_personality.patch xattr-add-missing-consts-to-function-arguments.patch keys-increase-the-payload-size-when-instantiating-a-key.patch keys-check-starting-keyring-as-part-of-search.patch keys-allow-the-callout-data-to-be-passed-as-a-blob-rather-than-a-string.patch keys-add-keyctl-function-to-get-a-security-label.patch keys-add-keyctl-function-to-get-a-security-label-fix.patch keys-switch-to-proc_create.patch keys-allow-clients-to-set-key-perms-in-key_create_or_update.patch keys-dont-generate-user-and-user-session-keyrings-unless-theyre-accessed.patch keys-make-the-keyring-quotas-controllable-through-proc-sys.patch keys-make-the-keyring-quotas-controllable-through-proc-sys-fix.patch keys-explicitly-include-required-slabh-header-file.patch keys-make-key_serial-a-function-if-config_keys=y.patch procfs-task-exe-symlink.patch procfs-task-exe-symlink-fix.patch procfs-task-exe-symlink-fix-2.patch alloc_uid-cleanup.patch rename-div64_64-to-div64_u64.patch afs-use-the-shorter-list_head-for-brevity.patch afs-the-afs-rpc-op-cbgetcapabilities-is-actually-cbtellmeaboutyourself.patch afs-the-afs-rpc-op-cbgetcapabilities-is-actually-cbtellmeaboutyourself-try-3.patch mutex-subsystem-synchro-test-module.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html