From: Hauke Mehrtens Date: Sat, 5 Oct 2013 13:34:37 +0000 (+0200) Subject: backports: remove BACKPORT_BUILD_CROSS_RESERVATION X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=756af986373da84153cef6a7bc7d696cbf0a27ae;p=openwrt%2Fstaging%2Fblogic.git backports: remove BACKPORT_BUILD_CROSS_RESERVATION This was only needed for some of the DRM drivers, remove it. Signed-off-by: Hauke Mehrtens --- diff --git a/backport/backport-include/linux/reservation.h b/backport/backport-include/linux/reservation.h deleted file mode 100644 index ff79ae8e0db2..000000000000 --- a/backport/backport-include/linux/reservation.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef _BACKPORT_LINUX_RESERVATION_H -#define _BACKPORT_LINUX_RESERVATION_H - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) -#include_next -#else -#ifdef CPTCFG_BACKPORT_BUILD_CROSS_RESERVATION -/* - * Header file for reservations for dma-buf and ttm - * - * Copyright(C) 2011 Linaro Limited. All rights reserved. - * Copyright (C) 2012-2013 Canonical Ltd - * Copyright (C) 2012 Texas Instruments - * - * Authors: - * Rob Clark - * Maarten Lankhorst - * Thomas Hellstrom - * - * Based on bo.c which bears the following copyright notice, - * but is dual licensed: - * - * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -#include - -extern struct ww_class reservation_ww_class; - -struct reservation_object { - struct ww_mutex lock; -}; - -#define reservation_object_init LINUX_BACKPORT(reservation_object_init) -static inline void -reservation_object_init(struct reservation_object *obj) -{ - ww_mutex_init(&obj->lock, &reservation_ww_class); -} - -#define reservation_object_fini LINUX_BACKPORT(reservation_object_fini) -static inline void -reservation_object_fini(struct reservation_object *obj) -{ - ww_mutex_destroy(&obj->lock); -} - -#endif /* BACKPORT_BUILD_CROSS_RESERVATION */ -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) */ -#endif /* _BACKPORT_LINUX_RESERVATION_H */ diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig index 83770131b37e..f3c1ab3d1fda 100644 --- a/backport/compat/Kconfig +++ b/backport/compat/Kconfig @@ -139,13 +139,6 @@ config BACKPORT_BUILD_DMA_SHARED_BUFFER #h-file linux/dma-buf.h #c-file drivers/base/dma-buf.c -config BACKPORT_BUILD_CROSS_RESERVATION - bool - # not possible on kernel < 3.2 - depends on !BACKPORT_KERNEL_3_2 - depends on BACKPORT_BUILD_DMA_SHARED_BUFFER || DMA_SHARED_BUFFER - default y if BACKPORT_USERSEL_BUILD_ALL - config BACKPORT_DMA_SHARED_BUFFER bool diff --git a/backport/compat/Makefile b/backport/compat/Makefile index 14b407635b2e..101d0f33ae76 100644 --- a/backport/compat/Makefile +++ b/backport/compat/Makefile @@ -42,4 +42,3 @@ compat-$(CPTCFG_BACKPORT_BUILD_GENERIC_ATOMIC64) += compat_atomic.o compat-$(CPTCFG_BACKPORT_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o compat-$(CPTCFG_BACKPORT_BUILD_RADIX_HELPERS) += lib-radix-tree-helpers.o compat-$(CPTCFG_BACKPORT_BUILD_WW_MUTEX) += kernel/ww_mutex.o -compat-$(CPTCFG_BACKPORT_BUILD_CROSS_RESERVATION) += drivers-base-reservation.o diff --git a/backport/compat/drivers-base-reservation.c b/backport/compat/drivers-base-reservation.c deleted file mode 100644 index 840ca1af3d2e..000000000000 --- a/backport/compat/drivers-base-reservation.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2012-2013 Canonical Ltd - * - * Based on bo.c which bears the following copyright notice, - * but is dual licensed: - * - * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ -/* - * Authors: Thomas Hellstrom - */ - -#include -#include - -DEFINE_WW_CLASS(reservation_ww_class); -EXPORT_SYMBOL_GPL(reservation_ww_class);