From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw7IX-00020K-VL for qemu-devel@nongnu.org; Fri, 29 Apr 2016 08:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aw7IL-0003Au-MH for qemu-devel@nongnu.org; Fri, 29 Apr 2016 08:13:24 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:59455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw7IL-00030R-Br for qemu-devel@nongnu.org; Fri, 29 Apr 2016 08:13:17 -0400 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Apr 2016 06:12:39 -0600 From: Dong Jia Shi Date: Fri, 29 Apr 2016 14:11:49 +0200 Message-Id: <1461931915-22397-3-git-send-email-bjsdjshi@linux.vnet.ibm.com> In-Reply-To: <1461931915-22397-1-git-send-email-bjsdjshi@linux.vnet.ibm.com> References: <1461931915-22397-1-git-send-email-bjsdjshi@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH RFC 2/8] s390: move orb.h from drivers/s390/ to arch/s390/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-devel@nongnu.org Cc: bjsdjshi@linux.vnet.ibm.com, renxiaof@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, agraf@suse.com, alex.williamson@redhat.com Let's make orb-related definitions available outside of the common I/O layer for future use (e.g. for passing channel devices to a guest). Signed-off-by: Dong Jia Shi Reviewed-by: Pierre Morel --- {drivers/s390/cio => arch/s390/include/asm}/orb.h | 0 drivers/s390/cio/eadm_sch.c | 2 +- drivers/s390/cio/eadm_sch.h | 2 +- drivers/s390/cio/io_sch.h | 2 +- drivers/s390/cio/ioasm.c | 2 +- drivers/s390/cio/ioasm.h | 2 +- drivers/s390/cio/trace.h | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename {drivers/s390/cio => arch/s390/include/asm}/orb.h (100%) diff --git a/drivers/s390/cio/orb.h b/arch/s390/include/asm/orb.h similarity index 100% rename from drivers/s390/cio/orb.h rename to arch/s390/include/asm/orb.h diff --git a/drivers/s390/cio/eadm_sch.c b/drivers/s390/cio/eadm_sch.c index b3f44bc..8082a03 100644 --- a/drivers/s390/cio/eadm_sch.c +++ b/drivers/s390/cio/eadm_sch.c @@ -21,12 +21,12 @@ #include #include #include +#include #include "eadm_sch.h" #include "ioasm.h" #include "cio.h" #include "css.h" -#include "orb.h" MODULE_DESCRIPTION("driver for s390 eadm subchannels"); MODULE_LICENSE("GPL"); diff --git a/drivers/s390/cio/eadm_sch.h b/drivers/s390/cio/eadm_sch.h index 9664e46..2184920 100644 --- a/drivers/s390/cio/eadm_sch.h +++ b/drivers/s390/cio/eadm_sch.h @@ -5,7 +5,7 @@ #include #include #include -#include "orb.h" +#include struct eadm_private { union orb orb; diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h index 8975060..b768523 100644 --- a/drivers/s390/cio/io_sch.h +++ b/drivers/s390/cio/io_sch.h @@ -5,8 +5,8 @@ #include #include #include +#include #include "css.h" -#include "orb.h" struct io_subchannel_private { union orb orb; /* operation request block */ diff --git a/drivers/s390/cio/ioasm.c b/drivers/s390/cio/ioasm.c index 9898481..7fd413d 100644 --- a/drivers/s390/cio/ioasm.c +++ b/drivers/s390/cio/ioasm.c @@ -7,9 +7,9 @@ #include #include #include +#include #include "ioasm.h" -#include "orb.h" #include "cio.h" int stsch(struct subchannel_id schid, struct schib *addr) diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h index b31ee6b..b2ca4a3 100644 --- a/drivers/s390/cio/ioasm.h +++ b/drivers/s390/cio/ioasm.h @@ -4,7 +4,7 @@ #include #include #include -#include "orb.h" +#include #include "cio.h" #include "trace.h" diff --git a/drivers/s390/cio/trace.h b/drivers/s390/cio/trace.h index 5b807a0..ba58f7c 100644 --- a/drivers/s390/cio/trace.h +++ b/drivers/s390/cio/trace.h @@ -7,10 +7,10 @@ #include #include +#include #include #include #include "cio.h" -#include "orb.h" #undef TRACE_SYSTEM #define TRACE_SYSTEM s390 -- 2.6.6