From 38fff141859fe1fa341114fb51d775e4136b287e Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 14 Dec 2012 11:01:18 -0800 Subject: [PATCH] compat-drivers: refresh patches for next-20121214 Signed-off-by: Luis R. Rodriguez --- patches/collateral-evolutions/drm/03-swiotlb.patch | 12 ++++++------ .../drm/04-revert-prime-support.patch | 14 +++++++------- .../drm/06-rename-config-options.patch | 4 ++-- .../network/11-dev-pm-ops.patch | 4 ++-- .../network/14-device-type.patch | 2 +- .../network/15-symbol-export-conflicts.patch | 2 +- .../network/25-multicast-list_head.patch | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/patches/collateral-evolutions/drm/03-swiotlb.patch b/patches/collateral-evolutions/drm/03-swiotlb.patch index 697c0634b751..e6dc53fe1649 100644 --- a/patches/collateral-evolutions/drm/03-swiotlb.patch +++ b/patches/collateral-evolutions/drm/03-swiotlb.patch @@ -5,7 +5,7 @@ to backport it to compat.git. So revert the changes. --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c -@@ -1376,11 +1376,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t +@@ -1373,11 +1373,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t } #endif @@ -19,7 +19,7 @@ to backport it to compat.git. So revert the changes. r = ttm_pool_populate(ttm); if (r) { -@@ -1426,12 +1428,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt +@@ -1423,12 +1425,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt } #endif @@ -36,7 +36,7 @@ to backport it to compat.git. So revert the changes. if (ttm_dma->dma_address[i]) { --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c -@@ -601,11 +601,13 @@ static int radeon_ttm_tt_populate(struct +@@ -602,11 +602,13 @@ static int radeon_ttm_tt_populate(struct } #endif @@ -50,7 +50,7 @@ to backport it to compat.git. So revert the changes. r = ttm_pool_populate(ttm); if (r) { -@@ -647,12 +649,14 @@ static void radeon_ttm_tt_unpopulate(str +@@ -648,12 +650,14 @@ static void radeon_ttm_tt_unpopulate(str } #endif @@ -65,7 +65,7 @@ to backport it to compat.git. So revert the changes. for (i = 0; i < ttm->num_pages; i++) { if (gtt->ttm.dma_address[i]) { -@@ -875,6 +879,7 @@ static int radeon_ttm_debugfs_init(struc +@@ -876,6 +880,7 @@ static int radeon_ttm_debugfs_init(struc radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs; radeon_mem_types_list[i].driver_features = 0; radeon_mem_types_list[i++].data = NULL; @@ -73,7 +73,7 @@ to backport it to compat.git. So revert the changes. #ifdef CONFIG_SWIOTLB if (swiotlb_nr_tbl()) { sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool"); -@@ -884,6 +889,7 @@ static int radeon_ttm_debugfs_init(struc +@@ -885,6 +890,7 @@ static int radeon_ttm_debugfs_init(struc radeon_mem_types_list[i++].data = NULL; } #endif diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch index e6a85c69eb80..9fb1d69d158d 100644 --- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch +++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch @@ -120,7 +120,7 @@ not < 3.3.0. +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -354,8 +354,10 @@ static const struct file_operations rade +@@ -355,8 +355,10 @@ static const struct file_operations rade static struct drm_driver kms_driver = { .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | @@ -133,7 +133,7 @@ not < 3.3.0. .dev_priv_size = 0, .load = radeon_driver_load_kms, .firstopen = radeon_driver_firstopen_kms, -@@ -390,10 +392,12 @@ static struct drm_driver kms_driver = { +@@ -391,10 +393,12 @@ static struct drm_driver kms_driver = { .dumb_destroy = radeon_mode_dumb_destroy, .fops = &radeon_driver_kms_fops, @@ -161,7 +161,7 @@ not < 3.3.0. } --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c -@@ -582,17 +582,21 @@ static int radeon_ttm_tt_populate(struct +@@ -583,17 +583,21 @@ static int radeon_ttm_tt_populate(struct struct radeon_ttm_tt *gtt = (void *)ttm; unsigned i; int r; @@ -183,7 +183,7 @@ not < 3.3.0. rdev = radeon_get_rdev(ttm->bdev); #if __OS_HAS_AGP -@@ -636,10 +640,12 @@ static void radeon_ttm_tt_unpopulate(str +@@ -637,10 +641,12 @@ static void radeon_ttm_tt_unpopulate(str struct radeon_device *rdev; struct radeon_ttm_tt *gtt = (void *)ttm; unsigned i; @@ -198,7 +198,7 @@ not < 3.3.0. #if __OS_HAS_AGP --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c -@@ -1354,11 +1354,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t +@@ -1351,11 +1351,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t struct drm_device *dev; unsigned i; int r; @@ -213,7 +213,7 @@ not < 3.3.0. if (slave && ttm->sg) { /* make userspace faulting work */ drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages, -@@ -1366,6 +1369,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *t +@@ -1363,6 +1366,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *t ttm->state = tt_unbound; return 0; } @@ -221,7 +221,7 @@ not < 3.3.0. drm = nouveau_bdev(ttm->bdev); dev = drm->dev; -@@ -1413,10 +1417,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt +@@ -1410,10 +1414,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt struct nouveau_drm *drm; struct drm_device *dev; unsigned i; diff --git a/patches/collateral-evolutions/drm/06-rename-config-options.patch b/patches/collateral-evolutions/drm/06-rename-config-options.patch index 5c5996bb744a..b267e3f8c4e7 100644 --- a/patches/collateral-evolutions/drm/06-rename-config-options.patch +++ b/patches/collateral-evolutions/drm/06-rename-config-options.patch @@ -174,7 +174,7 @@ CFLAGS_radeon_trace_points.o := -I$(src) --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -226,7 +226,7 @@ static struct pci_device_id pciidlist[] +@@ -227,7 +227,7 @@ static struct pci_device_id pciidlist[] radeon_PCI_IDS }; @@ -183,7 +183,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist); #endif -@@ -440,7 +440,7 @@ static int __init radeon_init(void) +@@ -441,7 +441,7 @@ static int __init radeon_init(void) #endif /* if enabled by default */ if (radeon_modeset == -1) { diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch index 42b74e3c1ef8..8255138e3c61 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch @@ -201,7 +201,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -338,6 +338,9 @@ static int iwl_pci_resume(struct device +@@ -343,6 +343,9 @@ static int iwl_pci_resume(struct device return iwl_trans_resume(iwl_trans); } @@ -211,7 +211,7 @@ calls on compat code with only slight modifications. static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -353,7 +356,12 @@ static struct pci_driver iwl_pci_driver +@@ -358,7 +361,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, diff --git a/patches/collateral-evolutions/network/14-device-type.patch b/patches/collateral-evolutions/network/14-device-type.patch index 765a783cb227..5e519b4982b1 100644 --- a/patches/collateral-evolutions/network/14-device-type.patch +++ b/patches/collateral-evolutions/network/14-device-type.patch @@ -22,7 +22,7 @@ compile warning. enum nl80211_iftype iftype, int num) --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c -@@ -527,9 +527,11 @@ static struct device *bnep_get_device(st +@@ -526,9 +526,11 @@ static struct device *bnep_get_device(st return conn ? &conn->dev : NULL; } diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch index 9b6d36eb333e..6cfefbb12951 100644 --- a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch +++ b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch @@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our. --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -3243,7 +3243,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3244,7 +3244,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head.patch b/patches/collateral-evolutions/network/25-multicast-list_head.patch index dd1f4f615463..80c076ebba5d 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head.patch @@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2499,7 +2499,11 @@ struct ieee80211_ops { +@@ -2504,7 +2504,11 @@ struct ieee80211_ops { void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); u64 (*prepare_multicast)(struct ieee80211_hw *hw, -- 2.30.2