From patchwork Wed Jan 7 13:33:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 42817 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A3F1220558 for ; Wed, 7 Jan 2015 13:33:59 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id r20sf789546wiv.9 for ; Wed, 07 Jan 2015 05:33:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=+fWaESu+ywBXWjGqplHVdDegi90zch/SuCsnqLlyg0g=; b=edG5IBMEoFO9LZJqeN+k3unyvwj8TWb1UHTPPwU29vlHW5BAbR3dwDvB/NfYU20wT6 Wkwxc60AV9ZCAOJ9MrrOlOP1ksw4civnBtHoP5jKiuIjAq4ds85lY/eQoZnGer/duUtV H0J4KvU09OTglBAY2JYwYHLiawvlNdEWPeb85Owp5r5NaBflwMr82WAOb0/8KEUQNJS5 60mG/lc13BKvtHgETflso/449jGVQs4IO6VreqrJiks46woTX15B/zeLq48mykXH7Ouq BIAtZaLElP2qJsIok0hWuHiet1PhjTz5mnK/2wStem+s2kVUGemOzfUtuRbZBEx3a2vQ FrtQ== X-Gm-Message-State: ALoCoQnVxs0sGrGiBZ2EB5SC51VPdeqmaxMM6LNzvrG5sPABT/9Lzx/cJFR1WK9RbBgbwjJK+aDO X-Received: by 10.180.189.116 with SMTP id gh20mr511608wic.2.1420637638954; Wed, 07 Jan 2015 05:33:58 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.11.163 with SMTP id ej3ls161366lad.94.gmail; Wed, 07 Jan 2015 05:33:58 -0800 (PST) X-Received: by 10.112.198.233 with SMTP id jf9mr4622319lbc.9.1420637638787; Wed, 07 Jan 2015 05:33:58 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id gh10si2824534lbc.38.2015.01.07.05.33.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Jan 2015 05:33:58 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id gd6so3458129lab.1 for ; Wed, 07 Jan 2015 05:33:58 -0800 (PST) X-Received: by 10.112.170.36 with SMTP id aj4mr4520737lbc.3.1420637638664; Wed, 07 Jan 2015 05:33:58 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1482325lbb; Wed, 7 Jan 2015 05:33:57 -0800 (PST) X-Received: by 10.229.104.199 with SMTP id q7mr4609931qco.8.1420637637004; Wed, 07 Jan 2015 05:33:57 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id c90si1849594qgc.123.2015.01.07.05.33.56 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 07 Jan 2015 05:33:56 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y8qkD-0000nH-N8; Wed, 07 Jan 2015 13:33:53 +0000 Received: from mail-oi0-f49.google.com ([209.85.218.49]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y8qk8-0000nC-JZ for lng-odp@lists.linaro.org; Wed, 07 Jan 2015 13:33:48 +0000 Received: by mail-oi0-f49.google.com with SMTP id a141so2802184oig.8 for ; Wed, 07 Jan 2015 05:33:43 -0800 (PST) X-Received: by 10.182.225.232 with SMTP id rn8mr2013564obc.23.1420637623210; Wed, 07 Jan 2015 05:33:43 -0800 (PST) Received: from localhost.localdomain (cpe-24-28-70-239.austin.res.rr.com. [24.28.70.239]) by mx.google.com with ESMTPSA id o93sm925487oik.21.2015.01.07.05.33.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jan 2015 05:33:42 -0800 (PST) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 7 Jan 2015 07:33:34 -0600 Message-Id: <1420637614-3841-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.1.0 X-Topics: patch Subject: [lng-odp] [PATCHv2] linux-generic: buffers: remove vestigial asserts for 32-bit support X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: bill.fischofer@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Fix for bug 1031 to enable linux-generic compiles on 32-bit systems. Signed-off-by: Bill Fischofer --- platform/linux-generic/include/odp_buffer_internal.h | 3 --- platform/linux-generic/include/odp_timer_internal.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 60f06c9..c64802b 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -136,9 +136,6 @@ typedef struct odp_buffer_hdr_t { typedef struct odp_buffer_hdr_stride { uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(odp_buffer_hdr_t))]; } odp_buffer_hdr_stride; -/* Ensure next header starts from 8 byte align */ -_ODP_STATIC_ASSERT((sizeof(odp_buffer_hdr_t) % 8) == 0, - "ODP_BUFFER_HDR_T__SIZE_ERROR"); typedef struct odp_buf_blk_t { struct odp_buf_blk_t *next; diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h index 0d10d00..c635e3b 100644 --- a/platform/linux-generic/include/odp_timer_internal.h +++ b/platform/linux-generic/include/odp_timer_internal.h @@ -59,9 +59,6 @@ _ODP_STATIC_ASSERT(sizeof(odp_timeout_hdr_t) == ODP_OFFSETOF(odp_timeout_hdr_t, buf_data), "ODP_TIMEOUT_HDR_T__SIZE_ERR"); -_ODP_STATIC_ASSERT(sizeof(odp_timeout_hdr_t) % sizeof(uint64_t) == 0, - "ODP_TIMEOUT_HDR_T__SIZE_ERR2"); - /** * Return timeout header