From 31bd06885ed56d84addf4236c8c38d2e01c0eec8 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Mon, 17 May 2010 14:34:57 +1000
Subject: [PATCH] --- yaml --- r: 190907 b: refs/heads/master c:
 81880d603d00c645e0890d0a44d50711c503b72b h: refs/heads/master i:   190905:
 1057cf45dfdad3917d7a2434ad04b853f016e46f   190903:
 94ba77c59055901a39ae88de129d44f7c1bc7819 v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/types.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f6581546862e..d41a364e4a10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3d46f9d3194e0329216002a8724d4c0957abc79
+refs/heads/master: 81880d603d00c645e0890d0a44d50711c503b72b
diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h
index c42724f8c802..23d237a075e2 100644
--- a/trunk/include/linux/types.h
+++ b/trunk/include/linux/types.h
@@ -188,12 +188,12 @@ typedef u32 phys_addr_t;
 typedef phys_addr_t resource_size_t;
 
 typedef struct {
-	volatile int counter;
+	int counter;
 } atomic_t;
 
 #ifdef CONFIG_64BIT
 typedef struct {
-	volatile long counter;
+	long counter;
 } atomic64_t;
 #endif