svn commit: r312617 - in head/sys/powerpc: include powerpc

[Justin Hibbits]

Author: jhibbits
Date: Sun Jan 22 06:30:55 2017
New Revision: 312617
URL: https://svnweb.freebsd.org/changeset/base/312617

Log:
  Hide the 'MOREARGS' macro, it conflicts with contrib code, and is only used in one file.
  
  PR:		211818
  Reported by:	Mark Millard <markmi AT dsl-only.net>
  MFC after:	2 weeks

Modified:
  head/sys/powerpc/include/frame.h
  head/sys/powerpc/powerpc/trap.c

Modified: head/sys/powerpc/include/frame.h
==============================================================================
--- head/sys/powerpc/include/frame.h	Sun Jan 22 06:25:41 2017	(r312616)
+++ head/sys/powerpc/include/frame.h	Sun Jan 22 06:30:55 2017	(r312617)
@@ -109,7 +109,5 @@ struct callframe {
 /* Definitions for syscalls */
 #define	FIRSTARG	3				/* first arg in reg 3 */
 #define	NARGREG		8				/* 8 args in regs */
-#define	MOREARGS(sp)	((caddr_t)((uintptr_t)(sp) + \
-    sizeof(struct callframe) - 3*sizeof(register_t))) /* more args go here */
 
 #endif	/* _MACHINE_FRAME_H_ */

Modified: head/sys/powerpc/powerpc/trap.c
==============================================================================
--- head/sys/powerpc/powerpc/trap.c	Sun Jan 22 06:25:41 2017	(r312616)
+++ head/sys/powerpc/powerpc/trap.c	Sun Jan 22 06:30:55 2017	(r312617)
@@ -80,6 +80,9 @@ __FBSDID("$FreeBSD$");
 #define	FAULTBUF_CR	22
 #define	FAULTBUF_R14	3
 
+#define	MOREARGS(sp)	((caddr_t)((uintptr_t)(sp) + \
+    sizeof(struct callframe) - 3*sizeof(register_t))) /* more args go here */
+
 static void	trap_fatal(struct trapframe *frame);
 static void	printtrap(u_int vector, struct trapframe *frame, int isfatal,
 		    int user);