From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Gordeev Subject: [PATCH v2 2/9] Move phys_addr_t type definition to lib/libcflat.h Date: Wed, 27 Apr 2016 15:13:51 +0200 Message-ID: <13a90e6eb8da3a52db9e299f1c1d5ce1e82e7b89.1461762418.git.agordeev@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Alexander Gordeev , Andrew Jones , Thomas Huth , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:49330 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752492AbcD0NOG (ORCPT ); Wed, 27 Apr 2016 09:14:06 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 1A29981F07 for ; Wed, 27 Apr 2016 13:14:06 +0000 (UTC) In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: 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=C4=8Dm=C3=A1=C5=99 Suggested-by: Andrew Jones Signed-off-by: Alexander Gordeev --- arm/selftest.c | 1 - lib/alloc.h | 1 - lib/arm/asm/page.h | 2 -- lib/arm/asm/setup.h | 1 - lib/arm/setup.c | 1 - lib/libcflat.h | 2 ++ lib/powerpc/asm/setup.h | 1 - 7 files changed, 2 insertions(+), 7 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); } =20 -typedef u64 phys_addr_t; #define INVALID_PHYS_ADDR (~(phys_addr_t)0) =20 /* 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 @@ =20 #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) =20 -#include - typedef u64 pteval_t; typedef u64 pmdval_t; typedef u64 pgdval_t; diff --git a/lib/arm/asm/setup.h b/lib/arm/asm/setup.h index cb8fdbd..a502a04 100644 --- a/lib/arm/asm/setup.h +++ b/lib/arm/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 */ #include #include =20 diff --git a/lib/arm/setup.c b/lib/arm/setup.c index 8c6172f..1cba23a 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include 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" =20 +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 */ =20 #define NR_CPUS 8 /* arbitrarily set for now */ extern u32 cpus[NR_CPUS]; --=20 1.8.3.1