From owner-p4-projects@FreeBSD.ORG  Fri Feb 23 17:11:31 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3440816A406; Fri, 23 Feb 2007 17:11:30 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BA82416A403
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 17:11:30 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id AAD8B13C474
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 17:11:30 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NHBUxE046949
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 17:11:30 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NHBUSw046942
	for perforce@freebsd.org; Fri, 23 Feb 2007 17:11:30 GMT
	(envelope-from millert@freebsd.org)
Date: Fri, 23 Feb 2007 17:11:30 GMT
Message-Id: <200702231711.l1NHBUSw046942@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114884 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Feb 2007 17:11:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=114884

Change 114884 by millert@millert_macbook on 2007/02/23 17:10:47

	This is a kernel-only include; remove non-kernel portion.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#8 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#8 (text+ko) ====

@@ -47,19 +47,15 @@
  */
 
 #include <sys/types.h>			/* NOTE: mach sys/types, not BSD one. */
-#ifdef KERNEL
 #include <kern/locks.h>
 #include <libkern/OSByteOrder.h>
 #include <libkern/OSAtomic.h>
-#else
-#include <sys/lock.h>
-#include <architecture/byte_order.h>
-#endif
 
 typedef u_int64_t u64;
 typedef u_int64_t __le64;
 typedef u_int32_t u32;
 typedef u_int32_t __le32;
+typedef u_int32_t __be32;
 typedef u_int16_t u16;
 typedef u_int16_t __le16;
 typedef u_int16_t __be16;
@@ -91,19 +87,6 @@
 #define	likely(exp)	__builtin_expect(!!(exp), 1)
 #define	unlikely(exp)	__builtin_expect(!!(exp), 0)
 
-#if !defined(_KERNEL) && !defined(KERNEL)
-
-/* sedarwin uses same ss source files for userspace */
-#define kcalloc(nmemb, size, flags) calloc(nmemb, size)
-#define kmalloc(size, flags) malloc(size)
-#define kzalloc(size, flags) calloc(1, size)
-#define kfree(v) free(v)
-#define __get_free_page(flags) malloc(PAGE_SIZE)
-#define GFP_ATOMIC  1
-#define GFP_KERNEL  2
-
-#else /* _KERNEL */
-
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 #define NIPQUAD(addr) \
@@ -170,8 +153,6 @@
 	} while (!OSCompareAndSwap(oldval, newval, ptr));
 }
 
-#endif /* _KERNEL */
-
 #define BUG() printf("BUG: %s:%d", __FILE__, __LINE__)
 #define BUG_ON(x) do { if (x) BUG(); } while(0)