From owner-svn-src-projects@FreeBSD.ORG  Wed Apr 11 09:25:21 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D196106566B;
	Wed, 11 Apr 2012 09:25:21 +0000 (UTC)
	(envelope-from jceel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38C718FC12;
	Wed, 11 Apr 2012 09:25:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3B9PLIO064594;
	Wed, 11 Apr 2012 09:25:21 GMT (envelope-from jceel@svn.freebsd.org)
Received: (from jceel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3B9PL5H064592;
	Wed, 11 Apr 2012 09:25:21 GMT (envelope-from jceel@svn.freebsd.org)
Message-Id: <201204110925.q3B9PL5H064592@svn.freebsd.org>
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Wed, 11 Apr 2012 09:25:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234129 - projects/armv6/sys/arm/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 09:25:21 -0000

Author: jceel
Date: Wed Apr 11 09:25:20 2012
New Revision: 234129
URL: http://svn.freebsd.org/changeset/base/234129

Log:
  Fix #ifdef ARM_TP_ADDRESS at PULLFRAMEFROMSVCANDEXIT to bring ARMv5 back to work.

Modified:
  projects/armv6/sys/arm/include/asmacros.h

Modified: projects/armv6/sys/arm/include/asmacros.h
==============================================================================
--- projects/armv6/sys/arm/include/asmacros.h	Wed Apr 11 07:21:51 2012	(r234128)
+++ projects/armv6/sys/arm/include/asmacros.h	Wed Apr 11 09:25:20 2012	(r234129)
@@ -187,7 +187,7 @@
  * exit.
  */
 
-#ifndef ARM_TP_ADDRESS
+#ifdef ARM_TP_ADDRESS
 #define PULLFRAMEFROMSVCANDEXIT						   \
         ldr     r0, [sp], #0x0004;	/* Get the SPSR from stack */	   \
         msr     spsr_all, r0;		/* restore SPSR */		   \