From owner-p4-projects@FreeBSD.ORG Tue Dec 12 22:51:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F28C16A40F; Tue, 12 Dec 2006 22:51:58 +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 CCDA316A47E for ; Tue, 12 Dec 2006 22:51:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0ECF43FA8 for ; Tue, 12 Dec 2006 22:07:08 +0000 (GMT) (envelope-from imp@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 kBCM8VnJ078146 for ; Tue, 12 Dec 2006 22:08:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCM8V4s078137 for perforce@freebsd.org; Tue, 12 Dec 2006 22:08:31 GMT (envelope-from imp@freebsd.org) Date: Tue, 12 Dec 2006 22:08:31 GMT Message-Id: <200612122208.kBCM8V4s078137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Dec 2006 22:51:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111579 Change 111579 by imp@imp_lighthouse on 2006/12/12 22:08:26 Move __NO_STRICT_ALIGNMENT and use it. Affected files ... .. //depot/projects/arm/src/sys/amd64/include/_types.h#7 edit .. //depot/projects/arm/src/sys/amd64/include/param.h#5 edit .. //depot/projects/arm/src/sys/i386/include/_types.h#7 edit .. //depot/projects/arm/src/sys/i386/include/param.h#4 edit .. //depot/projects/arm/src/sys/net/bpf_filter.c#5 edit .. //depot/projects/arm/src/sys/net/if_loop.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/amd64/include/_types.h#7 (text+ko) ==== @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __NO_STRICT_ALIGNMENT - /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -66,6 +66,7 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __NO_STRICT_ALIGNMENT #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT ==== //depot/projects/arm/src/sys/i386/include/_types.h#7 (text+ko) ==== @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __NO_STRICT_ALIGNMENT - /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/i386/include/param.h#4 (text+ko) ==== @@ -51,6 +51,7 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __NO_STRICT_ALIGNMENT #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT ==== //depot/projects/arm/src/sys/net/bpf_filter.c#5 (text+ko) ==== @@ -38,11 +38,7 @@ #include -#ifdef sun -#include -#endif - -#ifndef __i386__ +#ifndef __NO_STRICT_ALIGNMENT #define BPF_ALIGN #endif ==== //depot/projects/arm/src/sys/net/if_loop.c#8 (text+ko) ==== @@ -290,7 +290,7 @@ /* Strip away media header */ if (hlen > 0) { m_adj(m, hlen); -#if defined(__ia64__) || defined(__sparc64__) +#ifndef __NO_STRICT_ALIGNMENT /* * Some archs do not like unaligned data, so * we move data down in the first mbuf.