From 92263b51dfabfe3de57afbb4bb25b60a089747e3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 8 Mar 2013 14:23:26 +0100 Subject: main/linux-gresc: fix the iommu/amd init patch --- main/linux-grsec/APKBUILD | 10 +++++----- main/linux-grsec/patch-3.6.11-al5.patch | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 5c67e02ba..3375c6893 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.6.11 _kernver=3.6 -pkgrel=16 +pkgrel=17 _al=5 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net @@ -17,7 +17,7 @@ source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz patch-3.6.11-al${_al}.patch grsecurity-2.9.1-3.6.11-al${_al}-unofficial-0.patch - + 0004-arp-flush-arp-cache-on-device-change.patch r8169-num-rx-desc.patch ipv4-remove-output-route-check-in-ipv4_mtu.patch @@ -148,7 +148,7 @@ dev() { md5sums="1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz bd4bba74093405887d521309a74c19e9 patch-3.6.11.xz -bc5dd29ae16718a7bdf3241313999122 patch-3.6.11-al5.patch +820b19a4cb9b2d95b998a7096a0784f0 patch-3.6.11-al5.patch 5de38a21b1217b13326a862c7b88f1da grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch daf2cbb558588c49c138fe9ca2482b64 r8169-num-rx-desc.patch @@ -160,7 +160,7 @@ d9b4a528e722d10ba53034ebd440c31b ipv4-remove-output-route-check-in-ipv4_mtu.pat 4927251c008b2c2bf5648d732ec63f9d kernelconfig.x86_64" sha256sums="4ab9a6ef1c1735713f9f659d67f92efa7c1dfbffb2a2ad544005b30f9791784f linux-3.6.tar.xz 4bdc3822571a4a765bf6f347aad8b899730acef549ae4236813fd17f254f4327 patch-3.6.11.xz -7b06dc536709a68cd03918231a8c9c59d236ab7ae898fd80f042413422e6e210 patch-3.6.11-al5.patch +79d754deced2d975efeeb316354bf1577266d30442c2243971a279a8d8fcb292 patch-3.6.11-al5.patch d44e17a36af283c2cfe2d07dc4e0325a110ccf9d29253f605d7f6793d3166ce4 grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch e2d2d1503f53572c6a2e21da729a13a430dd01f510405ffb3a33b29208860bde 0004-arp-flush-arp-cache-on-device-change.patch fdce1143aa10a48582b5bb9cf441b75c6f52701a61f28139970f3110a170fb97 r8169-num-rx-desc.patch @@ -172,7 +172,7 @@ c4236fa6150c9cba98280aadc2daccd917410148e06d2231cc8c5370d1735577 kernelconfig.x 3afefde6d92e1c41f6487c2279c5b707ef42ce42e4f7fe9e37d482c3e24ec3b1 kernelconfig.x86_64" sha512sums="6e3354184d1799228a2d33b92e4a6b743cc24352b8ccc1fd487fab07ab97be2aa03ba87b8406a177581692db1fd40674fbd4e213a782cbe0a6a969b10c4c17a1 linux-3.6.tar.xz 08423f145ee7aef49f50d95032595ee79250135b6ecfa72f802502a277f215b63c4dc04ed149fe4ed7cdaa5ef063b8003b7f72f41d8417e45efbe7e30e621387 patch-3.6.11.xz -1aaae390ee31a77bd4fa8acc4563ed4a438c6143074364853dcf5126d973d6ad5d39713e76086f36cf06c9027df676b30332f02cfc0de607f4b89e1d3f2ed21f patch-3.6.11-al5.patch +92cad1b250ce10af0424148c41c4da8d90370d65b9821bbcf8de215eedaef4b8c7bd54c4bbea4a83a557489c3af81bc482d810783febf9c4aaa3b9f20a64fd37 patch-3.6.11-al5.patch 5cefb9bf53bf99a0173a6e1037427d75a4d926b3d9c66fff38355007efa48a07ed6be3e6796537c9e068eb3ea09085d3cf86df5833238318d201c95ca3ed9583 grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch b6fdf376009f0f0f3fa194cb11be97343e4d394cf5d3547de6cfca8ad619c5bd3f60719331fd8cfadc47f09d22be8376ba5f871b46b24887ea73fe47e233a54e 0004-arp-flush-arp-cache-on-device-change.patch d9c91b57415c7c3c365add35565f72ba6225e48212f55abb209e1f426902206543edefb9fc01715357e445b69222a6fb94c3469d701e465450919bad3c83d874 r8169-num-rx-desc.patch diff --git a/main/linux-grsec/patch-3.6.11-al5.patch b/main/linux-grsec/patch-3.6.11-al5.patch index 54952a485..87941ad57 100644 --- a/main/linux-grsec/patch-3.6.11-al5.patch +++ b/main/linux-grsec/patch-3.6.11-al5.patch @@ -4509,7 +4509,7 @@ index d6cc77a..5f306f7 100644 return retval; diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c -index 18a89b7..2a5e8dd 100644 +index 18a89b7..85a928a 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -906,6 +906,38 @@ static void __init free_iommu_all(void) @@ -4560,11 +4560,29 @@ index 18a89b7..2a5e8dd 100644 return pci_enable_device(iommu->dev); } -@@ -1667,6 +1701,11 @@ static int amd_iommu_init_dma(void) +@@ -1580,9 +1614,6 @@ static int __init early_amd_iommu_init(void) + if (amd_iommu_pd_alloc_bitmap == NULL) + goto out; + +- /* init the device table */ +- init_device_table(); +- + /* + * let all alias entries point to itself + */ +@@ -1657,6 +1688,7 @@ static bool detect_ivrs(void) + + static int amd_iommu_init_dma(void) + { ++ struct amd_iommu *iommu; + int ret; + + if (iommu_pass_through) +@@ -1667,6 +1699,11 @@ static int amd_iommu_init_dma(void) if (ret) return ret; -+ init_device_table_dma(); ++ init_device_table(); + + for_each_iommu(iommu) + iommu_flush_all_caches(iommu); -- cgit v1.2.3