From patchwork Mon Dec 12 03:08:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 704913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tcSjX60Btz9svs for ; Mon, 12 Dec 2016 14:18:56 +1100 (AEDT) Received: from localhost ([::1]:58367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGH8g-0002KB-O1 for incoming@patchwork.ozlabs.org; Sun, 11 Dec 2016 22:18:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGGyu-0002pN-MO for qemu-devel@nongnu.org; Sun, 11 Dec 2016 22:08:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGGyr-0003OR-IY for qemu-devel@nongnu.org; Sun, 11 Dec 2016 22:08:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cGGyr-0003OK-Ch for qemu-devel@nongnu.org; Sun, 11 Dec 2016 22:08:45 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8EE2AC04B927; Mon, 12 Dec 2016 03:08:44 +0000 (UTC) Received: from pxdev.xzpeter.org (vpn1-5-149.pek2.redhat.com [10.72.5.149]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBC38M7x005906; Sun, 11 Dec 2016 22:08:41 -0500 From: Peter Xu To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Mon, 12 Dec 2016 11:08:12 +0800 Message-Id: <1481512100-10380-7-git-send-email-peterx@redhat.com> In-Reply-To: <1481512100-10380-1-git-send-email-peterx@redhat.com> References: <1481512100-10380-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 12 Dec 2016 03:08:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [kvm-unit-tests PATCH v8 06/14] libcflat: moving MIN/MAX here X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, rkrcmar@redhat.com, peterx@redhat.com, agordeev@redhat.com, jan.kiszka@web.de, pbonzini@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" That's something can be used outside alloc.c. Reviewed-by: Andrew Jones Signed-off-by: Peter Xu --- lib/alloc.c | 3 --- lib/libcflat.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/alloc.c b/lib/alloc.c index e1d7b8a..58af52b 100644 --- a/lib/alloc.c +++ b/lib/alloc.c @@ -7,9 +7,6 @@ #include "asm/spinlock.h" #include "asm/io.h" -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) - #define PHYS_ALLOC_NR_REGIONS 256 struct phys_alloc_region { diff --git a/lib/libcflat.h b/lib/libcflat.h index 88b10e2..94d2a53 100644 --- a/lib/libcflat.h +++ b/lib/libcflat.h @@ -40,6 +40,9 @@ #define SZ_2M (1 << 21) #define SZ_1G (1 << 30) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + typedef uint8_t u8; typedef int8_t s8; typedef uint16_t u16;