From owner-svn-src-user@FreeBSD.ORG  Mon Mar  1 02:52:37 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB748106566C;
	Mon,  1 Mar 2010 02:52:37 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A0B508FC16;
	Mon,  1 Mar 2010 02:52:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o212qbtF069728;
	Mon, 1 Mar 2010 02:52:37 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o212qbPJ069726;
	Mon, 1 Mar 2010 02:52:37 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003010252.o212qbPJ069726@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 1 Mar 2010 02:52:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204500 - user/jmallett/octeon/sys/mips/cavium
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 02:52:37 -0000

Author: jmallett
Date: Mon Mar  1 02:52:37 2010
New Revision: 204500
URL: http://svn.freebsd.org/changeset/base/204500

Log:
  Add much-needed volatile.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Mon Mar  1 00:46:45 2010	(r204499)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h	Mon Mar  1 02:52:37 2010	(r204500)
@@ -94,19 +94,19 @@ extern struct pcpu *cpuid_to_pcpu[];
 
 static inline void oct_write64 (uint64_t csr_addr, uint64_t val64)
 {
-    uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr;
+    volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr;
     *ptr = val64;
 }
 
 static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i)
 {
-    int64_t *ptr = (int64_t *)(intptr_t)csr_addr;
+    volatile int64_t *ptr = (volatile int64_t *)(intptr_t)csr_addr;
     *ptr = val64i;
 }
 
 static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8)
 {
-    uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr;
+    volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr;
     *ptr = (uint64_t) val8;
 }
 
@@ -127,32 +127,32 @@ static inline void oct_write32 (uint64_t
 
 static inline uint8_t oct_read8 (uint64_t csr_addr)
 {
-    uint8_t *ptr = (uint8_t *)(intptr_t)csr_addr;
+    volatile uint8_t *ptr = (volatile uint8_t *)(intptr_t)csr_addr;
     return (*ptr);
 }
 
 static inline uint8_t oct_read16 (uint64_t csr_addr)
 {
-    uint16_t *ptr = (uint16_t *)(intptr_t)csr_addr;
+    volatile uint16_t *ptr = (volatile uint16_t *)(intptr_t)csr_addr;
     return (*ptr);
 }
 
 
 static inline uint32_t oct_read32 (uint64_t csr_addr)
 {
-    uint32_t *ptr = (uint32_t *)(intptr_t)csr_addr;
+    volatile uint32_t *ptr = (volatile uint32_t *)(intptr_t)csr_addr;
     return (*ptr);
 }
 
 static inline uint64_t oct_read64 (uint64_t csr_addr)
 {
-    uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr;
+    volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr;
     return (*ptr);
 }
 
 static inline int32_t oct_readint32 (uint64_t csr_addr)
 {
-    int32_t *ptr = (int32_t *)(intptr_t)csr_addr;
+    volatile int32_t *ptr = (volatile int32_t *)(intptr_t)csr_addr;
     return (*ptr);
 }