From patchwork Thu May 5 14:26:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9024911 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 724359F372 for ; Thu, 5 May 2016 14:27:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B4C3203B8 for ; Thu, 5 May 2016 14:27:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99435203B7 for ; Thu, 5 May 2016 14:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756329AbcEEO0x (ORCPT ); Thu, 5 May 2016 10:26:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62843 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753786AbcEEO0w (ORCPT ); Thu, 5 May 2016 10:26:52 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 D3C976439C for ; Thu, 5 May 2016 14:26:51 +0000 (UTC) Received: from dhcp-27-118.brq.redhat.com (dhcp-27-122.brq.redhat.com [10.34.27.122]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u45EQlYZ012334; Thu, 5 May 2016 10:26:50 -0400 From: Alexander Gordeev To: kvm@vger.kernel.org Cc: Alexander Gordeev , Andrew Jones , Thomas Huth , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [kvm-unit-tests PATCH v7 02/11] Move phys_addr_t type definition to lib/libcflat.h Date: Thu, 5 May 2016 16:26:35 +0200 Message-Id: <5db576d21e89e981bc6bdf6b9561057d97bf949e.1462457467.git.agordeev@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 05 May 2016 14:26:51 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This change leads to removing '#include 's from several places that only included alloc.h to get the typedef. Cc: Andrew Jones Cc: Thomas Huth Cc: Radim Kr?má? Suggested-by: Andrew Jones Reviewed-by: Andrew Jones Signed-off-by: Alexander Gordeev --- arm/selftest.c | 1 - lib/alloc.h | 1 - lib/arm/asm/page.h | 2 -- lib/libcflat.h | 2 ++ lib/powerpc/asm/setup.h | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arm/selftest.c b/arm/selftest.c index 75dc91f..a8ae191 100644 --- a/arm/selftest.c +++ b/arm/selftest.c @@ -7,7 +7,6 @@ */ #include #include -#include #include #include #include diff --git a/lib/alloc.h b/lib/alloc.h index 0b4b4bd..c12bd15 100644 --- a/lib/alloc.h +++ b/lib/alloc.h @@ -58,7 +58,6 @@ static inline void *memalign(size_t alignment, size_t size) return alloc_ops->memalign(alignment, size); } -typedef u64 phys_addr_t; #define INVALID_PHYS_ADDR (~(phys_addr_t)0) /* diff --git a/lib/arm/asm/page.h b/lib/arm/asm/page.h index df76969..3802641 100644 --- a/lib/arm/asm/page.h +++ b/lib/arm/asm/page.h @@ -16,8 +16,6 @@ #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) -#include - typedef u64 pteval_t; typedef u64 pmdval_t; typedef u64 pgdval_t; diff --git a/lib/libcflat.h b/lib/libcflat.h index b58a8a1..f2ec33f 100644 --- a/lib/libcflat.h +++ b/lib/libcflat.h @@ -60,6 +60,8 @@ typedef _Bool bool; #define PRIx64 __PRI64_PREFIX "x" #define PRIxPTR __PRIPTR_PREFIX "x" +typedef u64 phys_addr_t; + extern void puts(const char *s); extern void exit(int code); extern void abort(void); diff --git a/lib/powerpc/asm/setup.h b/lib/powerpc/asm/setup.h index 29a6d7d..b1e1e5a 100644 --- a/lib/powerpc/asm/setup.h +++ b/lib/powerpc/asm/setup.h @@ -6,7 +6,6 @@ * This work is licensed under the terms of the GNU LGPL, version 2. */ #include -#include /* phys_addr_t */ #define NR_CPUS 8 /* arbitrarily set for now */ extern u32 cpus[NR_CPUS];