From 1a29d2b009cd8371b509bc43cf1dc1ffcadeb416 Mon Sep 17 00:00:00 2001
From: Mark Salter <msalter@redhat.com>
Date: Thu, 23 Sep 2010 16:40:22 +0100
Subject: [PATCH] --- yaml --- r: 210928 b: refs/heads/master c:
 fd429a0842c61b60e02a7e63430a609957821c67 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/mn10300/include/asm/bitops.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f29996ce8a9..b654194489c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57aebd7739c8dbbf403876ee1e9673fafc83d856
+refs/heads/master: fd429a0842c61b60e02a7e63430a609957821c67
diff --git a/trunk/arch/mn10300/include/asm/bitops.h b/trunk/arch/mn10300/include/asm/bitops.h
index f49ac49e09ad..3f50e9661076 100644
--- a/trunk/arch/mn10300/include/asm/bitops.h
+++ b/trunk/arch/mn10300/include/asm/bitops.h
@@ -229,9 +229,9 @@ int ffs(int x)
 #include <asm-generic/bitops/hweight.h>
 
 #define ext2_set_bit_atomic(lock, nr, addr) \
-	test_and_set_bit((nr) ^ 0x18, (addr))
+	test_and_set_bit((nr), (addr))
 #define ext2_clear_bit_atomic(lock, nr, addr) \
-	test_and_clear_bit((nr) ^ 0x18, (addr))
+	test_and_clear_bit((nr), (addr))
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #include <asm-generic/bitops/minix-le.h>