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: 9469977 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F09B460476 for ; Mon, 12 Dec 2016 03:08:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E36BB283E0 for ; Mon, 12 Dec 2016 03:08:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D69BB2840E; Mon, 12 Dec 2016 03:08:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 919D4283E0 for ; Mon, 12 Dec 2016 03:08:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754119AbcLLDIs (ORCPT ); Sun, 11 Dec 2016 22:08:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49826 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754113AbcLLDIo (ORCPT ); Sun, 11 Dec 2016 22:08:44 -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 Cc: drjones@redhat.com, agordeev@redhat.com, jan.kiszka@web.de, rkrcmar@redhat.com, pbonzini@redhat.com, peterx@redhat.com Subject: [kvm-unit-tests PATCH v8 06/14] libcflat: moving MIN/MAX here 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) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;