summaryrefslogtreecommitdiffstats
path: root/sys/i386/include
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2015-09-11 03:24:07 +0000
committermarkj <markj@FreeBSD.org>2015-09-11 03:24:07 +0000
commitdfb0cc5c03efdfd24efc1469b804742fd2d9bc5d (patch)
tree11760d447b62e31159f31afdca3fc3efbac38fae /sys/i386/include
parent3ff7032ecdcf849960103d5e02a6ff33abfed3ce (diff)
downloadFreeBSD-src-dfb0cc5c03efdfd24efc1469b804742fd2d9bc5d.zip
FreeBSD-src-dfb0cc5c03efdfd24efc1469b804742fd2d9bc5d.tar.gz
Merge stack(9) implementations for i386 and amd64 under x86/.
Reviewed by: jhb, kib Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D3255
Diffstat (limited to 'sys/i386/include')
-rw-r--r--sys/i386/include/stack.h42
1 files changed, 3 insertions, 39 deletions
diff --git a/sys/i386/include/stack.h b/sys/i386/include/stack.h
index f63fc4b..091ae33 100644
--- a/sys/i386/include/stack.h
+++ b/sys/i386/include/stack.h
@@ -1,42 +1,6 @@
-/*-
- * Mach Operating System
- * Copyright (c) 1991,1990 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_STACK_H_
-#define _MACHINE_STACK_H_
-
/*
- * Stack trace.
+ * This file is in the public domain.
*/
+/* $FreeBSD$ */
-struct i386_frame {
- struct i386_frame *f_frame;
- int f_retaddr;
- int f_arg0;
-};
-
-#endif /* !_MACHINE_STACK_H_ */
+#include <x86/stack.h>
OpenPOWER on IntegriCloud