lkml.org 
[lkml]   [2016]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 24/24] drivers: Add visorbus to the drivers directory
    Date
    visorbus is currently located at drivers/staging/visorbus,
    this patch moves it to drivers/virt.

    Signed-off-by: David Kershner <david.kershner@unisys.com>
    ---
    drivers/staging/unisys/Kconfig | 3 +--
    drivers/staging/unisys/Makefile | 1 -
    drivers/virt/Kconfig | 2 ++
    drivers/virt/Makefile | 1 +
    drivers/{staging/unisys => virt}/visorbus/Kconfig | 0
    drivers/{staging/unisys => virt}/visorbus/Makefile | 0
    drivers/{staging/unisys => virt}/visorbus/controlvmchannel.h | 0
    drivers/{staging/unisys => virt}/visorbus/controlvmcompletionstatus.h | 0
    drivers/{staging/unisys => virt}/visorbus/iovmcall_gnuc.h | 0
    drivers/{staging/unisys => virt}/visorbus/vbuschannel.h | 0
    drivers/{staging/unisys => virt}/visorbus/vbusdeviceinfo.h | 0
    drivers/{staging/unisys => virt}/visorbus/vbushelper.h | 0
    drivers/{staging/unisys => virt}/visorbus/visorbus_main.c | 0
    drivers/{staging/unisys => virt}/visorbus/visorbus_private.h | 0
    drivers/{staging/unisys => virt}/visorbus/visorchannel.c | 0
    drivers/{staging/unisys => virt}/visorbus/visorchipset.c | 0
    drivers/{staging/unisys => virt}/visorbus/vmcallinterface.h | 0
    17 files changed, 4 insertions(+), 3 deletions(-)
    rename drivers/{staging/unisys => virt}/visorbus/Kconfig (100%)
    rename drivers/{staging/unisys => virt}/visorbus/Makefile (100%)
    rename drivers/{staging/unisys => virt}/visorbus/controlvmchannel.h (100%)
    rename drivers/{staging/unisys => virt}/visorbus/controlvmcompletionstatus.h (100%)
    rename drivers/{staging/unisys => virt}/visorbus/iovmcall_gnuc.h (100%)
    rename drivers/{staging/unisys => virt}/visorbus/vbuschannel.h (100%)
    rename drivers/{staging/unisys => virt}/visorbus/vbusdeviceinfo.h (100%)
    rename drivers/{staging/unisys => virt}/visorbus/vbushelper.h (100%)
    rename drivers/{staging/unisys => virt}/visorbus/visorbus_main.c (100%)
    rename drivers/{staging/unisys => virt}/visorbus/visorbus_private.h (100%)
    rename drivers/{staging/unisys => virt}/visorbus/visorchannel.c (100%)
    rename drivers/{staging/unisys => virt}/visorbus/visorchipset.c (100%)
    rename drivers/{staging/unisys => virt}/visorbus/vmcallinterface.h (100%)

    diff --git a/drivers/staging/unisys/Kconfig b/drivers/staging/unisys/Kconfig
    index 4f1f5e6..dab09a9 100644
    --- a/drivers/staging/unisys/Kconfig
    +++ b/drivers/staging/unisys/Kconfig
    @@ -3,7 +3,7 @@
    #
    menuconfig UNISYSSPAR
    bool "Unisys SPAR driver support"
    - depends on X86_64 && !UML
    + depends on X86_64 && !UML && VIRT_DRIVERS
    select PCI
    select ACPI
    ---help---
    @@ -11,7 +11,6 @@ menuconfig UNISYSSPAR

    if UNISYSSPAR

    -source "drivers/staging/unisys/visorbus/Kconfig"
    source "drivers/staging/unisys/visornic/Kconfig"
    source "drivers/staging/unisys/visorinput/Kconfig"
    source "drivers/staging/unisys/visorhba/Kconfig"
    diff --git a/drivers/staging/unisys/Makefile b/drivers/staging/unisys/Makefile
    index 20eb098..e45f44b 100644
    --- a/drivers/staging/unisys/Makefile
    +++ b/drivers/staging/unisys/Makefile
    @@ -1,7 +1,6 @@
    #
    # Makefile for Unisys SPAR drivers
    #
    -obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/
    obj-$(CONFIG_UNISYS_VISORNIC) += visornic/
    obj-$(CONFIG_UNISYS_VISORINPUT) += visorinput/
    obj-$(CONFIG_UNISYS_VISORHBA) += visorhba/
    diff --git a/drivers/virt/Kconfig b/drivers/virt/Kconfig
    index 99ebdde..0c60896 100644
    --- a/drivers/virt/Kconfig
    +++ b/drivers/virt/Kconfig
    @@ -30,4 +30,6 @@ config FSL_HV_MANAGER
    4) A kernel interface for receiving callbacks when a managed
    partition shuts down.

    +source "drivers/virt/visorbus/Kconfig"
    endif
    +
    diff --git a/drivers/virt/Makefile b/drivers/virt/Makefile
    index c47f04d..44aebd2 100644
    --- a/drivers/virt/Makefile
    +++ b/drivers/virt/Makefile
    @@ -3,3 +3,4 @@
    #

    obj-$(CONFIG_FSL_HV_MANAGER) += fsl_hypervisor.o
    +obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/
    diff --git a/drivers/staging/unisys/visorbus/Kconfig b/drivers/virt/visorbus/Kconfig
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/Kconfig
    rename to drivers/virt/visorbus/Kconfig
    diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/virt/visorbus/Makefile
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/Makefile
    rename to drivers/virt/visorbus/Makefile
    diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/virt/visorbus/controlvmchannel.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/controlvmchannel.h
    rename to drivers/virt/visorbus/controlvmchannel.h
    diff --git a/drivers/staging/unisys/visorbus/controlvmcompletionstatus.h b/drivers/virt/visorbus/controlvmcompletionstatus.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/controlvmcompletionstatus.h
    rename to drivers/virt/visorbus/controlvmcompletionstatus.h
    diff --git a/drivers/staging/unisys/visorbus/iovmcall_gnuc.h b/drivers/virt/visorbus/iovmcall_gnuc.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/iovmcall_gnuc.h
    rename to drivers/virt/visorbus/iovmcall_gnuc.h
    diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/virt/visorbus/vbuschannel.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/vbuschannel.h
    rename to drivers/virt/visorbus/vbuschannel.h
    diff --git a/drivers/staging/unisys/visorbus/vbusdeviceinfo.h b/drivers/virt/visorbus/vbusdeviceinfo.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/vbusdeviceinfo.h
    rename to drivers/virt/visorbus/vbusdeviceinfo.h
    diff --git a/drivers/staging/unisys/visorbus/vbushelper.h b/drivers/virt/visorbus/vbushelper.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/vbushelper.h
    rename to drivers/virt/visorbus/vbushelper.h
    diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/virt/visorbus/visorbus_main.c
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/visorbus_main.c
    rename to drivers/virt/visorbus/visorbus_main.c
    diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/virt/visorbus/visorbus_private.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/visorbus_private.h
    rename to drivers/virt/visorbus/visorbus_private.h
    diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/virt/visorbus/visorchannel.c
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/visorchannel.c
    rename to drivers/virt/visorbus/visorchannel.c
    diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/virt/visorbus/visorchipset.c
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/visorchipset.c
    rename to drivers/virt/visorbus/visorchipset.c
    diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/virt/visorbus/vmcallinterface.h
    similarity index 100%
    rename from drivers/staging/unisys/visorbus/vmcallinterface.h
    rename to drivers/virt/visorbus/vmcallinterface.h
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-05-25 06:01    [W:4.562 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site