Touchscreen drivers for WM9705, WM9712, WM9713 and WM9715. branch, dev, updated. v2.6.25-8111-g2753d37
git at opensource.wolfsonmicro.com
git at opensource.wolfsonmicro.com
Mon May 12 16:13:57 BST 2008
The branch dev has been updated
via 2753d376634a569ed4f1c49dd5bd5aa35184b588 (commit)
via 492c2e476eac010962850006c49df326919b284c (commit)
via 57014123512633ab0c38a4fea4140bf156f6a3a0 (commit)
via c3921ab71507b108d51a0f1ee960f80cd668a93d (commit)
via ae429083efe996ca2c569c44fd6fea440676dc33 (commit)
via 60b129d7bfa3e20450816983bd52c49bb0bc1c21 (commit)
via b11a9d8392a698f01337232aa8c5d5603519943f (commit)
via b3eb5a0bc3c359dbb5ccb0708df18525ab6a1430 (commit)
via 88b283281f1c783a79af175c400b5d20f10af2aa (commit)
via 1a31a88f4f1a14f0b28ec3c5c179b93a10b24a18 (commit)
via c2fc54fcd340cbee47510aa84c346aab3440ba09 (commit)
via b1c1759cd192fe1d27989f986c7f6b2939905e0c (commit)
via f5fff3602a67ff8c98fccdbf15959780be542802 (commit)
via 9662369786b9d07fd46d65b0f9e3938a3e01a5d9 (commit)
via 854a989546c12683186c84601d4902591dddd8a9 (commit)
via 633331f389c2d9c631371d09a54626a5e4749452 (commit)
via 28e6103665301ce60634e8a77f0b657c6cc099de (commit)
via 986bef854fab44012df678a5b51817d5274d3ca1 (commit)
via 5bb7ff795fffc9418e3039cac77b42adcaae1a57 (commit)
via 3e1b83ab3912a6f583897635bee0a2e0cd1545f7 (commit)
via 8e3e076c5a78519a9f64cd384e8f18bc21882ce0 (commit)
via 00b41ec2611dc98f87f30753ee00a53db648d662 (commit)
via 39f004ba27fcd2431030a3bb3c949fa3f93fa4ca (commit)
via 9c3cdc1f83a6e07092392ff4aba6466517dbd1d0 (commit)
via 82fd866701881623d69fe280dbac06ddff1fdef9 (commit)
via 5c3a121d52b30a1e53cdaa802fa1965fcd243164 (commit)
via eb2b4e682a6d5b4779a7f1a6a8419982919795f6 (commit)
via 9096bd7a66efbe406910365c5206a32eed3875af (commit)
via fd3c3ed5d1e3ceb37635cbe6d220ab94aae0781d (commit)
via 0646153921892cc7a81320a6920beaca06b3e9f0 (commit)
via 5ecddcebfb7c737fe36494c77bd99ad045eab5ae (commit)
via c07c6053c41f736711ed856aa377007078c7c396 (commit)
via 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (commit)
via 5bf6c6e30d8b71d092e8830208e182d84b907fcd (commit)
via 005b1f7495e812b99b73de5adbc73afd7a1cbcaf (commit)
via 3ed43c745d2ce0c4ca15ad406285d1cc7e8ceec3 (commit)
via 26c5e98e88a6126adef2ddce21899e5afe823a2b (commit)
via a9545ee3c8153e133556aaaa8110337ca3f864dc (commit)
via c20b4b69f774896623a8ad87d974982bc89af7ed (commit)
via d9a9a23ff2b00463f25e880d13364938b321ab8a (commit)
via 9b013c2820c409ff84871e55e407ec2181782773 (commit)
via 41d88d55b2891203e98d1dc0acab949ffd0af078 (commit)
via a8f43ee7e108cecf68cac652d0a3aeedb8131220 (commit)
via 91e37a793b5a9436a2d12b2f0a8f52db3a133e1d (commit)
via a5dd69707424a35d2d2cc094e870f595ad61e916 (commit)
via 6c2545eefffc452e52302c96c955d9aa26353aa9 (commit)
via da109897a142dd017172c0ce7abf0be8646f7109 (commit)
via b8c15a6084e84497e31e75c9cededb73af768632 (commit)
via d236f5a5f77183c270223e8816804e7763463282 (commit)
via 9731e287e08b804592191d8bffaad023154af2aa (commit)
via 53962ecf6ebbdb5b15a8b35fbefe34430eb25609 (commit)
via 1c4a8119123e7e064344588d9a059bc0bb24e1ae (commit)
via f2fd25131b5a9c802faa1de1e9b5f1b06d16eec3 (commit)
via 24d9649574fbe591fdfa6b00893d4096f513e539 (commit)
via 1b70c5a6491dd02263e6d104b72d9b536f987021 (commit)
via 8af302e2dc91d4229968b8eedd4b45c0dd9fc717 (commit)
via 76bc080ef5a34aedb63e1691f28c6b42f3468e4e (commit)
via 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (commit)
via cdf7da899d840d47e075ff3bd761290653c68b77 (commit)
via 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02 (commit)
via f11c9c2fd9ab1732acd577bcf08a4a2be7f9aa65 (commit)
via f08269d3ecbb9300aeeb2d4272580f660afe9db9 (commit)
via 6cd5a86b56ec8fc8651c043bdb05ea0c662fb704 (commit)
via af4b3c355cbd38703471e55d11f42d8640db4118 (commit)
via 28a4acb48586dc21d2d14a75a7aab7be78b7c83b (commit)
via 89f92d6425b099538932e9b881588f87ef9f3184 (commit)
via 8d539108560ec121d59eee05160236488266221c (commit)
via 7c5e628f95b440b69332b1ed3eb112648fc8f7ff (commit)
via c4f51b4662074c6ee26c972126a317c05f65be06 (commit)
via f589274533eb94e0217acc1db6240ce6e621bb56 (commit)
via 625fc3a37511cbecfe1253867fe105c28d6a95f0 (commit)
via 19566ca6dc26600bae4b75701d4dced8d8540f16 (commit)
via f7c83a0aaa772f8d0189fa197d77c762caaa367a (commit)
via 8e1bf9ffb1aca693e3cf4a4f7144c8f70c8a08b0 (commit)
via 148c69b4b0ec267b08d3619651ae4a10a1768b04 (commit)
via 7a34912d90c17a90d9fad12c4c51833b4e70707b (commit)
via 0f1bce41fed02e45f31c2409f29e69e1fedebcdc (commit)
via da1ba891f22835db9a2c349315c3763e9f4e4e67 (commit)
via 8b2cc917a02936c3ea7d8da46801c7b7b6233093 (commit)
via 5be7a4792a31df6f2cd44bfba8da467ea20a0642 (commit)
via 4ea33e2dc2dab10960877e1649ee527c033f42c0 (commit)
via ba719baeabbff5476eeb91c223e6921ba29e1490 (commit)
via c1236d31a1b9fc018b85e15a3e58e3601ddc90ae (commit)
via ac7b77f13f2f33270276f88ad0f427e031552e04 (commit)
via 32fb3ca8fda036936053b4bbfbc6589626cb2437 (commit)
via 3168cb98be7199325de633052680098660ccaf84 (commit)
via cb6969e8cdef39e613b1755eff595f830b89bc82 (commit)
via 8594303a7abc1a117b1d91412ce9b3d77ed35d02 (commit)
via 9a0f4aea878315ba87cb8a4d0dddc67832218e3f (commit)
via a8b1ecf3d5c48ebde9fed61c7a682b2270e09d2b (commit)
via a1f2aa1be2f7a6883ba46faa53ed82595dee2a06 (commit)
via 55d7b68996a5064f011d681bca412b6281d2f711 (commit)
via 3f9827bc05581b6bb34ab0c6b5d8e028f71b4e78 (commit)
via dc38e2ad53ca27968919dea6d7fa60575782d5a6 (commit)
via 46151122e0a2e80e5a6b2889f595e371fe2b600d (commit)
via bf726eab3711cf192405d21688a4b21e07b6188a (commit)
via 8d4a4300854f3971502e81dacd930704cb88f606 (commit)
via cb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0 (commit)
via 547acec7ecc32b14c2740de3f32ce7d1b36a0f69 (commit)
via ac44cc96fbc8f44c056fa37573e8447eec512b10 (commit)
via 75065ff619e42fe35178eda863cbcddd57776794 (commit)
via e3a2efa67a029453b8098dba179ec2d9d8df612e (commit)
via 30a717f7e951ec0260f31c0637ecf8e6268ba607 (commit)
via ffebabe0bf0de9ee500d4605d6acb71e1ee3b79f (commit)
via e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc (commit)
via c2ab7ac225e29006b7117d6a9fe8f3be8d98b0c2 (commit)
via 33f9936b2b73dba6c8685994c441c4fd30b04814 (commit)
via aca51397d01474f80cab8fc978559b45f2e453ad (commit)
via f3261aff35cbc811fee0e23eaea277f1b7286eca (commit)
via ef75d49f116bccbb80bccd423ecf3cb86c4509a5 (commit)
via 7312096454b6cd71267eaa3d0efb408e449e9ff3 (commit)
via c67fa02799bccca3d2e16582493da6d57812ec01 (commit)
via 62ab22278308a40bcb7f4079e9719ab8b7fe11b5 (commit)
via 02539d71fa98d5737bb668b02286c76241e4bac9 (commit)
via 7a28a1549f9514f3b0dd3dde5c7337ba5d44fba3 (commit)
via 1e0f50ae11ab5838009994a3266accc1319c90d9 (commit)
via 4370fe1c06ffa251b63b12a41e2599037a4b7f87 (commit)
via 720be99006c5830970d5b62633c92b29e4cef137 (commit)
via 995d538a5b09e3c129d8aac559f07a0f5cc3fc3c (commit)
via d58876e289b0153bf86162aa1a43249e0f0aa03d (commit)
via a276e588a92737889c21e736f2bbed8aecda25fb (commit)
via 3d2c2f3ef7c5425d23424326a2345c385bb2d415 (commit)
via 9b4e466f93c6b614d05139d84a930a55fe4cd781 (commit)
via 346b746300f470bb4a72b66275d6a43987c5dfa6 (commit)
via 191d4437b9c028afee1a0568d9c7e6e0b264c703 (commit)
via 4a65e3827bcff072e5f4a96b3f73f9f17eb7d6d8 (commit)
via 0fba32136579648a5782a41e93d4a79547456a89 (commit)
via 0146ba78b9339c27ed12545f9bdc208604354bb3 (commit)
via 3d83984e99d80672b1d2e3c7dfdd393631883428 (commit)
via 65c07d4b3d919ec4a9a95cf576b0685bd382cdf3 (commit)
via 57b84f2b674228e61d7e7b05493aa819244a7b56 (commit)
via 8a3ee0fc8fe3a7ad89997619ceed555288cf8366 (commit)
via 8cd9612e9b56222cf8d851153df7060de2b36273 (commit)
via 0305794c7a86f1b25281fb9109b76fc4578f6038 (commit)
via ae8a5348acaefc5cb1f60199ded30900d445c986 (commit)
via e305ec80eae8c1ea117d4a39e58181643d382a52 (commit)
via a1dc4b59fa4af97ae68ee214d4d72bbd7c7ec1dc (commit)
via 105eabfd5164dac5c3c825ae6bc050c1ad45ca51 (commit)
via 85f094ecb1c52b9ec9a88c9d2c8beaba72b4f21f (commit)
via 5e2c2872bd481ee20758d7cf4860f4ad1cefff98 (commit)
via 971ac16d56301c7150771409607846f9facc2f13 (commit)
via e35e283fa065f4c420d9469b2d87ec2e0180b784 (commit)
via f5f826c685464301e4316a9321eb95801c653158 (commit)
via 2a6b8148c050941dd61779cb0b49c5c3ea854ebf (commit)
via 640f7487a919dec4ea98b88a050331f6a4044ea9 (commit)
via 824fcdded0591b879dc0d5c1873c168ca4bf6fae (commit)
via ccd805874198c248498b5f269656ec14397eeede (commit)
via 9141d30a480850d989fc245909b98670a7b66ec1 (commit)
via 1a013e2ffc1154ce8ee7076385d83c574066d83c (commit)
via dc5dc7e6d71ca9fd1ea01a1418150af3b2937489 (commit)
via 3de2403e6659d71b36ec820dc9b942762ddfe6eb (commit)
via 1e38c126c9252b612697e34f43b1b3371c8ee31d (commit)
via e0164af66b6ec165836d1d862b3f800890713452 (commit)
via d9cadb0d2ffed847851945a66e80d0b9d767611c (commit)
via 592eb9997dc89cd0c8f89a505e5348bbddce70f6 (commit)
via 3679389b880a318f9b9cfebab5714443796f2f71 (commit)
via ebdf982aaeb0005d5093b10872adce17ea12f5ba (commit)
via bdd0f5f06e7647b545bec3ead2fa2a5fcdf0f0f9 (commit)
via 12137c593d127c6c1a3eb050674da047682badaf (commit)
via ab69b3cf1219e0d07bb4ea373f36b1de38af531c (commit)
via e2ab41cae418108f376ad1634d7507f56379f7a2 (commit)
via 2889d1ef1240591fa4c72a6753e0a8d1c6e18140 (commit)
via 2bfc8e9edf200aeeca18ee44bcbf6bce65438a42 (commit)
via b4d390d8d219452e5d4257c87134a6934d7fabeb (commit)
via 6e87d1500713767866db0668bbcec75719576f3c (commit)
via 5f51efc195dfb860c60fafb4e47fe4b7cad2626d (commit)
via ffee0259c9edcc4c0f06b60df51c461eeecad4c0 (commit)
via 67412f0e78dfbbbcb36e631d9df70c6c559d60d4 (commit)
via eeae1d48c011839d9e1cdc1e8aacf0193c9d8197 (commit)
via e5e1d3cb20034a3cbcfff1f0bae12201aa2ce17e (commit)
via 5816339310b2d9623cf413d33e538b45e815da5d (commit)
via 28f13702f03e527fcb979747a882cf366c489c50 (commit)
via 6d63c275572d1e6f00d4fa154f16fbb0d8c2d2bf (commit)
via 9afadc4b1fd25337003832c9a4668f9bd42cdda9 (commit)
via 221e583a735fc5d879d83c2a76b8ee5afcbdf146 (commit)
via dbaf2c003e151ad9231778819b0977f95e20e06f (commit)
via 2cdf79cafbd11580f5b63cd4993b45c1c4952415 (commit)
via 7f3d4ee108c184ab215036051087aaaaa8de7661 (commit)
via 07416d29bcf608257f1e5280642dcbe0021518a3 (commit)
via aa94b5371f6f898558d9fa5690cc6e4bf917a572 (commit)
via 45e576b1c3d0020607b8666c0247164e92c7d719 (commit)
via 74c76c84576eb2d806f40f6cb2fc8302c01869d8 (commit)
via b499d76bfd78e900039155247e1c21bfdf807b7b (commit)
via c6ca1850e78d60c299ceb4c240a04af9e2384f70 (commit)
via 5b8909871b80a6cc2bd21aa5262c1424e3d26339 (commit)
via 139b83dd57248a3c8fcfb256e562311ad61478e9 (commit)
via 0eaeafa10f3b2bd027e95859a6785d4c7fcc174c (commit)
via 2688905e6a9b3647bf7b452cb0ff2bdb166bd8fe (commit)
via bf0f97025c7306870b86ccd63669aa278e7ec1c2 (commit)
via 45828b812ddb608ddf83eff11601f62b726d13ab (commit)
via 89bf6dc51ac7adb5a7d443648d9eb76909a1df8e (commit)
via 56f87713022a6bdf00b0a50d086fdaddb54e8e5c (commit)
via e4f7c0bf1f2e8a1b184a33ab60e874391d70f86c (commit)
via b964c592d42a7146a0b157147432da882abd3404 (commit)
via 197fba56864082951ec52ae7d75b8177e44e471e (commit)
via d7323696a910e1c00dc055ecc8c52dfedd9bbb59 (commit)
via 96a87e2f158084f237dc7f871cee0ce8b55744f1 (commit)
via 60c05953c1908626d1d8aa6e6f24bac8b1c65602 (commit)
via b9c9e788942308cf295074a68d2081f20e554eb2 (commit)
via 72268689cf28091ba202d7c5f4e7c5d613edd4ac (commit)
via d7e5dd41e394397aefd25ea412aeb47cf1b54d80 (commit)
via 0893f1250f87e0a832f47bb60fb69ed0d52be7a3 (commit)
via 8513c42edb3f1c91a8418fae11846c87cf7b8581 (commit)
via 7d39270d31b91647722823a0919164dea9fd4ad7 (commit)
via ddb3f00ca0897f585128a6cca229eeb9d91fa6ef (commit)
via 1bfb4b21c7c39295f5535c139f796df1d51ec009 (commit)
via 14b03204c8060d036b04cbb18bbd6f6f311f4fed (commit)
via 19d6d7d53c8ff809182a1f092d2c6918146414e9 (commit)
via c2f9527979c14a21bbaa31c12a14204aabeb6e45 (commit)
via 67dea022d84f7c2b1e4d8c74a16fb07bf1a7d8f0 (commit)
via bd1d23a81083f03ac63afbb7656b87eed04d8953 (commit)
via c0a18111e571138747a98af18b3a2124df56a0d1 (commit)
via 273748cc908a901d082b4da5a16b2541c9d78a02 (commit)
via cf432eb50ffd03572c08a006f44e0069957cf300 (commit)
via d45100f7b69e3d9cd0cd5e956b6ac2c78d460d07 (commit)
via 3eb6753e20af1803d7784efc36e8208e8d5fac05 (commit)
via dea570e08a69b14808b2cab56d6b0dda72145fa6 (commit)
via 0e9913362a967377eb886bbdf305ec58aa07a878 (commit)
via db176c6ed8974fae94328ad5ac9e70b094ff22fd (commit)
via 6ce07c7b61e74af35a05060a2d6341f68fd92c9e (commit)
via aeed5fce37196e09b4dac3a1c00d8b7122e040ce (commit)
via bb78be8397d3b0900af3d717672218ee3ea07985 (commit)
via 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9 (commit)
via a815752ac0ffdb910e92958d41d28f4fb28e5296 (commit)
via 33dcdac2df54e66c447ae03f58c95c7251aa5649 (commit)
via dca3c33652e437ed02c30ed3eca3cecd0cc00838 (commit)
via 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (commit)
via 80daac3f86d4f5aafc9d3e79addb90fa118244e2 (commit)
via f227ec3ca2b7be449fb2156e82b40cceed87a34a (commit)
via e410553fd35afd6d290b65e02dc501722406377d (commit)
via 1b3aa7afb60d34867eea5e73ee943b2a026fc47c (commit)
via 01935d7d2c544a5dfc8313f79ed164d45115aa33 (commit)
via a86e2cbe263c193a70b2e5c5a0c7e53ed39fc0ad (commit)
via 46fa06170d59b6b9951d09354829d85090f0d911 (commit)
via 1daad055bfc928dfc8590664c455960059421151 (commit)
via aa807f79dad3d6a8e9b175d66418b0c5be1d5cd8 (commit)
via 54c852a2d61bb15d9b979410c2260edfb23d448c (commit)
via 31d9168d27fac127d449cb9fa252d880de872c7f (commit)
via 7ab267d4ecdad3032d6bb31619a2744fc2074b59 (commit)
via 97ac8caee238d2a81c23661916f7acd3a22c85fe (commit)
via e284e5c6601cbb16e48854be26aa57a8fa844e35 (commit)
via afd8e39919c913993ac2f9984af8a9ba21c63d27 (commit)
via 6fee40e9b8155a4af904d69765c96c00f975acf5 (commit)
via 9b9a8bfc8dfbe09dc57f274e32e8b06151abbad7 (commit)
via f162b9d58273a9a5747211133c8ccb2de5cf5ff2 (commit)
via 569f0c4d909c7f73de634abcdc36344cb72de36a (commit)
via ae68c39819ddf30549652962768a50edae5eec6f (commit)
via c4ebc66a1a8e3576322a9f47f0d06ec3c96a08d7 (commit)
via 822973ba79fd5a5b711270c2de7196c6b50c6687 (commit)
via 05177f178efe1459d2d0ac05430027ba201889a4 (commit)
via 22bfc6d5e19b72d50535ce32fd6dee2ce2e75775 (commit)
via ba66b242b1c3432b44d893c64124522b3bdce71e (commit)
via f8b0685a8ea8e3974f8953378ede2111f8d49d22 (commit)
via b3f677e501a494aa1582d4ff35fb3ac6f0a59b08 (commit)
via 049e8e04986bde66df9648d88d0960ab4cbd6992 (commit)
via ab5b0235c4e819c9bc45fa62c99f9fe49e73e701 (commit)
via 3ad400a92e9c7d2f7caa6c6f811dad9b7d3f333c (commit)
via 364fac0e56b9bd379330ef9e39d3761f0b491e2c (commit)
via b0dd9b8ef985291a8b40118c5f33b7935e273dcb (commit)
via 36f674d9a65264d3826ca7300bed441e22a624b2 (commit)
via c46938ccfe35a58a0873715ee4c26fc9eb8d87b3 (commit)
via 4c299ca3649ccf666819e7d4a27a68c39fa174f1 (commit)
via 29d187bb1e30682e228ce461c487d78d945c3e4f (commit)
via 10acf3b0d3b46c6ef5d6f0722f72ad9b743ea848 (commit)
via a90103298fd5ccd9a9df6d47bde9a3f371707037 (commit)
via eabd5eb1cb59bfb162e7aa23007248f2bb480816 (commit)
via 37b9046a3e433a0b0c39ad1e81ec187d5be800ba (commit)
via 00f42eabb204c68fa64ef72de834e74aca15c81f (commit)
via dd2890f60f8e15f14c8eb132779b2f15c49d1203 (commit)
via 3e4a139107e497a741c26f8a377a10f214d63ec1 (commit)
via 9b2c4e0bae854fb5e88c9cacc0dacf21631c5cb0 (commit)
via 616d4a98ad8749ebe17a8fcac67df65c321350ac (commit)
via 8e7decdb8b132ee970a2636931b7653dec6af472 (commit)
via a96df496ed1496f3e52a9b3c860cf967aa48adda (commit)
via 07ab85de4d960b6f39395e51c1853485ad120de5 (commit)
via cb6716c879ecf49e2af344926c6a476821812061 (commit)
via 78ab88f04f44bed566d51dce0c7cbfeff6449a06 (commit)
via 4880d10927c93d858d40e297361fff375ee98492 (commit)
via 9d1045ad68fcccfaf1393cc463ab6357693e8d1d (commit)
via 1da5ea1a8bf4ddb82831528223c853821cb1c9ab (commit)
via 5f6b1ea41b46bc63f667f9b30d939b49734c20b0 (commit)
via a15306365a16380f3bafee9e181ba01231d4acd7 (commit)
via bb896afe2089575ca1bb1fbf3f07b934e1ba999b (commit)
via 826be063eee9b4c2703fd86cfc9723bc391ff1cb (commit)
via c5057ddccbcb4bf363af628d7963a7475f4114a7 (commit)
via cf04690885972eaba830ee761de545a6956197e6 (commit)
via 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c (commit)
via 17aa7e034416e3080bc57a786d09ba0a4a044561 (commit)
via aac6abca858386438d9a7233c3471d2ecfa2f704 (commit)
via 3e51f33fcc7f55e6df25d15b55ed10c8b4da84cd (commit)
via a5574cf65b5f03ce9ade3918764fe22e5e2371e3 (commit)
via dfbf4a1bc319f0f9a31e39b2da1fa5c55e85af89 (commit)
via cb4ad1ffc7c0d8ea7dc8cd8ba303d83551716d46 (commit)
via 712555ee4f873515612f89554ad1a3fda5fa887e (commit)
via 690229a0912ca2fef8b542fe4d8b73acfcdc6e24 (commit)
via d7dcdc11cfa6a8860a29b09f985467b89224699d (commit)
via 673a90a1e05c8127886f7659d1a457169378371f (commit)
via b328ca182f01c2a04b85e0ee8a410720b104fbcc (commit)
via 104f64549c961a797ff5f7c59946a7caa335c5b0 (commit)
via 8ae121ac8666b0421aa20fd80d4597ec66fa54bc (commit)
via 983ed7a66bcec9dc307d89dc7af47cdf209e56af (commit)
via d478c2cfaa2476f8b6876f9eb4d8fddcfa986479 (commit)
via 733a0771df46af942b8355cd8bb15780106b4353 (commit)
via 2abdad0a4cd8f9413f778cc998e0ee7d60b28417 (commit)
via e05510d01ad1565e5e086a939261084d67ba2b10 (commit)
via a992241de614dd2b7c97a9ba64e28c0e563f19bf (commit)
via 19443178fbfbf40db15c86012fc37df1a44ab857 (commit)
via 108c1961847df2a875047c0fd27b419cb817d213 (commit)
via abdefbdbd5c683ddcb1dd0d3dd414d02f078a5da (commit)
via 48fc8de9cd093b8c9e2cfa339421862bae3a6cad (commit)
via b6d9d267f0d68104df910fca89149803aec82426 (commit)
via 3b17f136bf32984eb0faeb116bcd44ffe3503782 (commit)
via 4933d07531711e399d8d578036aa9fc1be2f9b20 (commit)
via 63a59fa7a74fccff64dbf7d9230bd9d91bddead4 (commit)
via ab1a852128d6f0677999eecbf6d04bf9f6fe9a9a (commit)
via 8376005ea471762e7a5957d5b9e788121c0ba726 (commit)
via 5717922a1b8cc477f45a0f4f11fe619392ba7133 (commit)
via 50f7ad2500b27ce5c42be3a6936f143b158f7bc3 (commit)
via 0df18ff366853cdf31e5238764ec5c63e6b5a398 (commit)
via 13a6ddb08e58a1bd344da7898c4e2f13bdf18c2f (commit)
via 82af7aca56c67061420d618cc5a30f0fd4106b80 (commit)
via e024cbd257efc2788b7d21b9353e966267485c87 (commit)
via 688b744d8bc84dc5cc646e97509113dc5e8818ed (commit)
via 7cfcd985d36031459cc64e3843ea36a4d801097d (commit)
via 001fddf5fdcfe2c08ac9c4e5ca80c5e5698363bb (commit)
via f92509371ec06227a7e29778f395776d31b0deab (commit)
via 2c36eecfb6471c457994647771d1405502ad5fde (commit)
via d6426171bab3403cdcd5613d5549f20b0ab0967c (commit)
via 2e75d050e42d1c61e820f9a35078a2f69e02cc3e (commit)
via 564c5bead424fa798dfbd5fe382b4e0b7ea483fb (commit)
via 20686c24377246d9eb57782551b25ff19df09873 (commit)
via 7bd3c0f73c9c5b47fd1ca49757c436e73f4cd55b (commit)
via 983e0972cea450fe5725d1ba11c78adfd5d7ad3a (commit)
via 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc (commit)
via c17f888f8fc2e47e2b4a51424f8ccf564ae87576 (commit)
via 0a6db7dc49b91875ff015934df3e85b8785f2294 (commit)
via fa1b1cff3d06550d23ef540c4f97ca83c021b473 (commit)
via 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50 (commit)
via b41e5fffe8b81fc939067d8c1c195cc79115d5a3 (commit)
via af3ce514ade2fd0e18c5d078d138a6c1137a33df (commit)
via 56783c5e4dd32ca370ad0bdf3a9c6c1aaee94726 (commit)
via 0885cb5653ff82c8d322df1b8a95843dc5f5486b (commit)
via 5ffc02a158997b1eb91ade8d02bcf521ff79a218 (commit)
via 0bbeafd0118fc3ae54990064760c889d41dc21d6 (commit)
via de1028927ae3487e2e450dacf50fbf32042aee18 (commit)
via f3d69e0507f84903059d456c5d19f10b2df3ac69 (commit)
via 7a2142002f29a7b398c49da9bdec712dc57087c7 (commit)
via 093c16bf9b107433643cbf0843ca7808df90823b (commit)
via d29694f0681e188cf75477f20904041744e78ef7 (commit)
via c0bace5c7029ef7cbb6e6ffaa0469a3c042e5029 (commit)
via 55d7cd74d44e7e0597f95db25c12f3e6c5e7916f (commit)
via 1ca4264ee17745779c341966c5e61ac69bfd17a6 (commit)
via 943906ba4bebf629d5cd770e48b8ec0ddc433869 (commit)
via 5711fe900dfef8d9afdbbb6d0f9c9720919d1d66 (commit)
via 1e0ba0060ffcee2e766ec3159196235b1a2a0ff3 (commit)
via 65e4113684e50cee75357ce10dc9026b0929e4e9 (commit)
via 339a7c41c913035bf58579f6e47b4ba29da83795 (commit)
via e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c (commit)
via c37aa90b0458d87342e0bb083f6bf7d113220d09 (commit)
via f74d505b58d36ceeef10e459094f0eb760681165 (commit)
via 45ea2103d8856454503b30464cc1dba378748d00 (commit)
via 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b (commit)
via eb28062f131b0a1da32b2554fd819af5221040de (commit)
via d0dcd41d7b463de955b7ae7a55f76ff4216ed665 (commit)
via 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e (commit)
via e73b65f1db7e3baa3db43951476b7d2d2381ba35 (commit)
via 826e4506a0acb6487910a5ebafe839f708a00e1c (commit)
via 2961b423037da60a8cb230963ee0d8c04473d73b (commit)
via 36bbfe2f097d5e09e8e9c83f55264bd538a0ebe1 (commit)
via 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8 (commit)
via c4143a83031aef7ba87a62cf654d6d8fb4d8e76e (commit)
via 62179849b40aded9e727cca5006627a1c4d6446e (commit)
via e26a28d190304d910ee49b81cbfe6d9241f56e86 (commit)
via 7b04fa014c11e6415da8b5a7999dbd201abad53c (commit)
via afaafe50ee15c59010f19273ebfb6c44f0962d7c (commit)
via 8bd1796dedd50abd7553afbe6113bd97cc88390f (commit)
via ecb783eae1372d69a53d406e1bdba8284e4bafcc (commit)
via 163ea310b68bdde89b1ac633fbf8c0db290d3f86 (commit)
via e37ee42caadab46cec277546099fa2a6207fff0b (commit)
via c5562faeaacf19e81a78ee37cc6b96ab1f3e68e4 (commit)
via dbe55f4797712f86691a0ee0b5f508693c7310fe (commit)
via 4c6214c75a5aca5417156a47cd890b128c5f0637 (commit)
via 22eecde2f9034764a3fd095eecfa3adfb8ec9a98 (commit)
via 48b83d2425d7781bb625b1c37b5f2a8963b6e23b (commit)
via 1024c5f4be4fc5b00337464fb8a442bebf15df68 (commit)
via b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc (commit)
via 93df766322ba1db2801e4b826985a4932dd75866 (commit)
via bc1a34f1bf354fabc03e3f465620c80e510d0e8f (commit)
via b4f14abd95cd8d42f08438f1c4ec3eafe41054ee (commit)
via ece15babfa514e06118f62f4df2c757d6209f4f0 (commit)
via dc7457ea52f88539dc72925360e6068d5c938a0f (commit)
via de368dceb33c3c068dbde1407aff75cd8e126f04 (commit)
via 45c5eb67da5a668abe79c23a7e64dbc87a600f90 (commit)
via 3fe913e7c550a869e250d04c34410f7a6e263f7c (commit)
via 1439442c7b257b47a83aea4daed8fbf4a32cdff9 (commit)
via b7ebfb0509692cd923e31650f81ed4d79c9a3e59 (commit)
via 0d15029895051904e31925ec63525cc3a637f7de (commit)
via 1ac593c97eb229da44819f66fea47975537c1177 (commit)
via 7b52345e2c4c7333bf7eba8034ffc4683fa63c91 (commit)
via 67253af52e9133fb4cfbf7a2448a2d3524d1fa6c (commit)
via 649de51b883746d76c5fa1614dd067054c9d702a (commit)
via c8df9a53e8d16877fc0b268b002af2a47a14643a (commit)
via f8b6389bd53361a19ec5236e298527c9c905ca4d (commit)
via 8c6d6adc6b87daa364ee9deb2e966021d37a7622 (commit)
via d56f546db97795dca5aa575b00b0e9886895ac87 (commit)
via be0c007ac64f880a946995d6d1fc654acc81484d (commit)
via ac551828993eecb8499ef9cc3c828fceb49bcf7a (commit)
via 59f7137a1369c25308672def38f3b126d0c7575a (commit)
via e544ff00da4b53069dbca3debbfb02d455f72467 (commit)
via 41fef0ee7b8f3fe3f3dd2ddc9b170f3d88bce595 (commit)
via 81d6ec6b36bdf30e283ab98e7646571484401dbb (commit)
via c8005785102e5b67ecf213f06a3d6c001f6f8cb4 (commit)
via 5b81d689e57a85b1ff60edfb65e5b8a12d28ecee (commit)
via 3ba08b00e0d8413d79be9cab8ec085ceb6ae6fd6 (commit)
via afa26be86b65a7183ceac29bdf1f51d6fc6932f0 (commit)
via 269f21344b23e552c21c9e2d7ca258479dcd7a0a (commit)
via d35c7b0e54a596c5a8134d75999b7f391a9c6550 (commit)
via 4f95f81a48623982879f4fa80c641933444afd18 (commit)
via 4359a023a8c3b247b348c310bf510b23f3c1ab64 (commit)
via 4346f65426cbceb64794b468e4af6f5632d58c5e (commit)
via 5ade9deaaa3e1f7291467d97b238648e43eae15e (commit)
via 77a8d5741f3ee2c79554382179cca7b5893d6ae9 (commit)
via c4d49776e8f5bf2d900d2b6d4855c1670a535ac5 (commit)
via c8286944b802c5ce4063ec3c334b38c6757a9434 (commit)
via 57ce41d1d18279cc90223f3deadca70c7de1cfca (commit)
via 3ae15e1623b9d32eb410c2a23d90e47b16e6acd0 (commit)
via 70b9f7dc1435412ca2b89b13a8353bd9915a7189 (commit)
via 98db6f193c93e9b4729215af2c9101210e11d26c (commit)
via 9b1ec9eceabe0c90d12116871f692263b69d476d (commit)
via ce4e2e4558903ef92edf1ab4e09b0b338a09fd61 (commit)
via 240e4419e0cfcba737883b637ec2bdcc071ea03d (commit)
via c416a41f99be190e1f558cb06f70ddd560ce8b4b (commit)
via f2ce825d2a89b30af14fa577298fecaab7bc9504 (commit)
via fa3959f457109cc7d082b86ea6daae927982815b (commit)
via 4b18f2a9c3964f7612b7403dddc1d1ba5443ae24 (commit)
via e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (commit)
via bf62fd887cab230f5952b611bde25e8e15acb454 (commit)
via 22ba0317c81ba263172baaefd2cb38de78c4598f (commit)
via 39da9847113a870b20fee9a7c216a848b9a5e9f7 (commit)
via 1dbbb6077426f8ce63d6a59c5ac6613e1689cbde (commit)
via d09e860cf07e7c9ee12920a09f5080e30a12a23a (commit)
via 404e86e1550cc2c84bb57a372af784585c732f9a (commit)
via 0206e61b467fde4d7b50f1a64355182a4fd9576b (commit)
via 21f20b69a567ca8971fe643d2ebe5d680c9b43af (commit)
via a57a0b1d0f66da5ff5dc8f1a5a999f4d2f66090a (commit)
via a13c81952444d032ad3b5b7027b330150dbe2408 (commit)
via 47df1793171771ff9b1622d30433ef6edf0eb280 (commit)
from c9bacf1c1a7ac84bd4408b25a2fe74fcb12fd1c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2753d376634a569ed4f1c49dd5bd5aa35184b588
Merge: c9bacf1c1a7ac84bd4408b25a2fe74fcb12fd1c6 492c2e476eac010962850006c49df326919b284c
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Mon May 12 16:13:38 2008 +0100
Merge commit 'v2.6.26-rc2' into dev
commit 492c2e476eac010962850006c49df326919b284c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 11 17:09:41 2008 -0700
Linux 2.6.26-rc2
commit 57014123512633ab0c38a4fea4140bf156f6a3a0
Merge: c3921ab71507b108d51a0f1ee960f80cd668a93d ae429083efe996ca2c569c44fd6fea440676dc33
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 11 17:09:24 2008 -0700
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Convert some more new-style drivers to use module aliasing
i2c: Match dummy devices by type
i2c-sibyte: Mark i2c_sibyte_add_bus() as static
i2c-sibyte: Correct a comment about frequency
i2c: Improve the functionality documentation
i2c: Improve smbus-protocol documentation
i2c-piix4: Blacklist two mainboards
i2c-piix4: Increase the intitial delay for the ServerWorks CSB5
i2c-mpc: Compare to NO_IRQ instead of zero
commit c3921ab71507b108d51a0f1ee960f80cd668a93d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 11 16:04:48 2008 -0700
Add new 'cond_resched_bkl()' helper function
It acts exactly like a regular 'cond_resched()', but will not get
optimized away when CONFIG_PREEMPT is set.
Normal kernel code is already preemptable in the presense of
CONFIG_PREEMPT, so cond_resched() is optimized away (see commit
02b67cc3ba36bdba351d6c3a00593f4ec550d9d3 "sched: do not do
cond_resched() when CONFIG_PREEMPT").
But when wanting to conditionally reschedule while holding a lock, you
need to use "cond_sched_lock(lock)", and the new function is the BKL
equivalent of that.
Also make fs/locks.c use it.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ae429083efe996ca2c569c44fd6fea440676dc33
Author: Jean Delvare <khali at linux-fr.org>
Date: Sun May 11 20:37:06 2008 +0200
i2c: Convert some more new-style drivers to use module aliasing
Update 3 more new-style i2c drivers to use standard module aliasing
instead of the old driver_name/type driver matching scheme. These
video drivers aren't used yet so converting them is trivial.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 60b129d7bfa3e20450816983bd52c49bb0bc1c21
Author: Jean Delvare <khali at linux-fr.org>
Date: Sun May 11 20:37:06 2008 +0200
i2c: Match dummy devices by type
As the old driver_name/type matching scheme is going away soon, change
the dummy device mechanism to use the new matching scheme.
This has the downside that dummy i2c clients can no longer choose
their name, they'll all appear as "dummy" in sysfs and in log
messages. I don't think it is a problem in practice though, as there
is little reason to use these i2c clients to log messages.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit b11a9d8392a698f01337232aa8c5d5603519943f
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date: Sun May 11 20:37:05 2008 +0200
i2c-sibyte: Mark i2c_sibyte_add_bus() as static
The i2c_sibyte_add_bus() function is not called, nor meant to, from
outside, so mark it as static; fixing a sparse warning too.
Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit b3eb5a0bc3c359dbb5ccb0708df18525ab6a1430
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date: Sun May 11 20:37:05 2008 +0200
i2c-sibyte: Correct a comment about frequency
The frequency may have been once hardcoded to 100 kHz, but currently it is
passed as an argument to i2c_sibyte_add_bus(), so update the comment to
match code. While at it, reformat a nearby comment for consistency. No
functional changes.
Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 88b283281f1c783a79af175c400b5d20f10af2aa
Author: Jean Delvare <khali at linux-fr.org>
Date: Sun May 11 20:37:05 2008 +0200
i2c: Improve the functionality documentation
Attempt to make the documentation about the I2C/SMBus functionality
checking API clearer.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 1a31a88f4f1a14f0b28ec3c5c179b93a10b24a18
Author: David Brownell <david-b at pacbell.net>
Date: Sun May 11 20:37:05 2008 +0200
i2c: Improve smbus-protocol documentation
Improve the smbus-protocol documentation file somewhat:
- Use the names of the SMBus protocol operations (from the 2.0
specification), not made-up-for-Linux names.
- Add the name of the call used to execute each operation ... and
point out that there are mismatches, where functions execute
different protocol operations than their names specify.
The most confusing examples are that "Read Byte" isn't executed by
i2c_smbus_read_byte(), and that "Write Byte" isn't executed by
i2c_smbus_write_byte(). When coding, that's not as bad as it may
seem; but that case would seem to be worth fixing.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit c2fc54fcd340cbee47510aa84c346aab3440ba09
Author: Jean Delvare <khali at linux-fr.org>
Date: Sun May 11 20:37:05 2008 +0200
i2c-piix4: Blacklist two mainboards
We had a report that running sensors-detect on a Sapphire AM2RD790
motherbord killed the CPU. While the exact cause is still unknown,
I'd rather play it safe and prevent any access to the SMBus on that
machine by not letting the i2c-piix4 driver attach to the SMBus host
device on that machine. Also blacklist a similar board made by DFI.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit b1c1759cd192fe1d27989f986c7f6b2939905e0c
Author: David Milburn <dmilburn at redhat.com>
Date: Sun May 11 20:37:05 2008 +0200
i2c-piix4: Increase the intitial delay for the ServerWorks CSB5
Per the PIIX4 errata, there maybe a delay between setting the
start bit in the Smbus Host Controller Register and the transaction
actually starting. If the driver doesn't delay long enough, it
may appear that the transaction is complete when actually it
hasn't started, this may lead to bus collisions.
While 1 ms appears to be enough for most chips, the ServerWorks CSB5
wants 2 ms.
Signed-off-by: David Milburn <dmilburn at redhat.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit f5fff3602a67ff8c98fccdbf15959780be542802
Author: Jon Smirl <jonsmirl at gmail.com>
Date: Sun May 11 20:37:04 2008 +0200
i2c-mpc: Compare to NO_IRQ instead of zero
Alter the mpc i2c driver to use the NO_IRQ symbol instead of the constant
zero when checking for valid interrupts. NO_IRQ=-1 on ppc and NO_IRQ=0 on
powerpc so the checks against zero are not correct.
Signed-off-by: Jon Smirl <jonsmirl at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 9662369786b9d07fd46d65b0f9e3938a3e01a5d9
Author: Bernhard Beck <kernel at goodcoffee.net>
Date: Sun May 11 09:23:13 2008 -0700
usb-serial: Add ThinkOptics WavIT
Add ThinkOptics WavIt to cp2101 device table
Signed-off-by: Bernhard Beck <kernel at goodcoffee.net>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 854a989546c12683186c84601d4902591dddd8a9
Merge: 633331f389c2d9c631371d09a54626a5e4749452 28e6103665301ce60634e8a77f0b657c6cc099de
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 11 09:55:48 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Fix debugger syscall restart interactions.
sparc: Fix ptrace() detach.
sparc32: Don't twiddle PT_DTRACE in exec.
sparc video: remove open boot prom code
commit 633331f389c2d9c631371d09a54626a5e4749452
Merge: 5bb7ff795fffc9418e3039cac77b42adcaae1a57 005b1f7495e812b99b73de5adbc73afd7a1cbcaf
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 11 09:52:45 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] revert new check-ready Status register logic
commit 28e6103665301ce60634e8a77f0b657c6cc099de
Author: David S. Miller <davem at davemloft.net>
Date: Sun May 11 02:07:19 2008 -0700
sparc: Fix debugger syscall restart interactions.
So, forever, we've had this ptrace_signal_deliver implementation
which tries to handle all of the nasties that can occur when the
debugger looks at a process about to take a signal. It's meant
to address all of these issues inside of the kernel so that the
debugger need not be mindful of such things.
Problem is, this doesn't work.
The idea was that we should do the syscall restart business first, so
that the debugger captures that state. Otherwise, if the debugger for
example saves the child's state, makes the child execute something
else, then restores the saved state, we won't handle the syscall
restart properly because we lose the "we're in a syscall" state.
The code here worked for most cases, but if the debugger actually
passes the signal through to the child unaltered, it's possible that
we would do a syscall restart when we shouldn't have.
In particular this breaks the case of debugging a process under a gdb
which is being debugged by yet another gdb. gdb uses sigsuspend
to wait for SIGCHLD of the inferior, but if gdb itself is being
debugged by a top-level gdb we get a ptrace_stop(). The top-level gdb
does a PTRACE_CONT with SIGCHLD to let the inferior gdb see the
signal. But ptrace_signal_deliver() assumed the debugger would cancel
out the signal and therefore did a syscall restart, because the return
error was ERESTARTNOHAND.
Fix this by simply making ptrace_signal_deliver() a nop, and providing
a way for the debugger to control system call restarting properly:
1) Report a "in syscall" software bit in regs->{tstate,psr}.
It is set early on in trap entry to a system call and is fully
visible to the debugger via ptrace() and regsets.
2) Test this bit right before doing a syscall restart. We have
to do a final recheck right after get_signal_to_deliver() in
case the debugger cleared the bit during ptrace_stop().
3) Clear the bit in trap return so we don't accidently try to set
that bit in the real register.
As a result we also get a ptrace_{is,clear}_syscall() for sparc32 just
like sparc64 has.
M68K has this same exact bug, and is now the only other user of the
ptrace_signal_deliver hook. It needs to be fixed in the same exact
way as sparc.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 986bef854fab44012df678a5b51817d5274d3ca1
Author: David S. Miller <davem at davemloft.net>
Date: Sat May 10 21:11:23 2008 -0700
sparc: Fix ptrace() detach.
Forever we had a PTRACE_SUNOS_DETACH which was unconditionally
recognized, regardless of the personality of the process.
Unfortunately, this value is what ended up in the GLIBC sys/ptrace.h
header file on sparc as PTRACE_DETACH and PT_DETACH.
So continue to recognize this old value. Luckily, it doesn't conflict
with anything we actually care about.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5bb7ff795fffc9418e3039cac77b42adcaae1a57
Merge: 3e1b83ab3912a6f583897635bee0a2e0cd1545f7 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 10 21:14:05 2008 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier.
[ARM] Orion: clean up addr-map.c after window setting code purge
[ARM] Orion: pass proper t_clk into mv643xx_eth
[ARM] Orion: use mv643xx_eth driver mbus window handling
[ARM] pxa: Fix RCSR handling
[ARM] lubbock: fix compilation
[ARM] 5032/1: Added cpufreq support for pxa27x CPU
[ARM] 5031/1: Indentation correction in cpu-pxa.c.
[ARM] 5028/1: pxafb: fix broken "backward compatibility way" in framebuffer
[ARM] 4882/2: Correction for S3C2410 clkout generation
[ARM] 5027/1: Fixed random memory corruption on pxa suspend cycle.
[ARM] 5024/1: Fix some minor clk issues in the MMCI PL18x driver
[ARM] 5023/1: Fix broken gpio interrupts on ep93xx
ns9xxx: fix sparse warning
ns9xxx: check for irq lockups
ns9xxx: fix handle_prio_irq to unmask irqs with lower priority
commit 3e1b83ab3912a6f583897635bee0a2e0cd1545f7
Merge: 8e3e076c5a78519a9f64cd384e8f18bc21882ce0 82fd866701881623d69fe280dbac06ddff1fdef9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 10 21:10:48 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: rdc: leds build/config fix
x86: sysfs cpu?/topology is empty in 2.6.25 (32-bit Intel system)
x86: revert commit 709f744 ("x86: bitops asm constraint fixes")
x86: restrict keyboard io ports reservation to make ipmi driver work
x86: fix fpu restore from sig return
x86: remove spew print out about bus to node mapping
x86: revert printk format warning change which is for linux-next
x86: cleanup PAT cpu validation
x86: geode: define geode_has_vsa2() even if CONFIG_MGEODE_LX is not set
x86: GEODE: cache results from geode_has_vsa2() and uninline
x86: revert geode config dependency
commit 8e3e076c5a78519a9f64cd384e8f18bc21882ce0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 10 20:58:02 2008 -0700
BKL: revert back to the old spinlock implementation
The generic semaphore rewrite had a huge performance regression on AIM7
(and potentially other BKL-heavy benchmarks) because the generic
semaphores had been rewritten to be simple to understand and fair. The
latter, in particular, turns a semaphore-based BKL implementation into a
mess of scheduling.
The attempt to fix the performance regression failed miserably (see the
previous commit 00b41ec2611dc98f87f30753ee00a53db648d662 'Revert
"semaphore: fix"'), and so for now the simple and sane approach is to
instead just go back to the old spinlock-based BKL implementation that
never had any issues like this.
This patch also has the advantage of being reported to fix the
regression completely according to Yanmin Zhang, unlike the semaphore
hack which still left a couple percentage point regression.
As a spinlock, the BKL obviously has the potential to be a latency
issue, but it's not really any different from any other spinlock in that
respect. We do want to get rid of the BKL asap, but that has been the
plan for several years.
These days, the biggest users are in the tty layer (open/release in
particular) and Alan holds out some hope:
"tty release is probably a few months away from getting cured - I'm
afraid it will almost certainly be the very last user of the BKL in
tty to get fixed as it depends on everything else being sanely locked."
so while we're not there yet, we do have a plan of action.
Tested-by: Yanmin Zhang <yanmin_zhang at linux.intel.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Andi Kleen <andi at firstfloor.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Alexander Viro <viro at ftp.linux.org.uk>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 00b41ec2611dc98f87f30753ee00a53db648d662
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 10 20:43:22 2008 -0700
Revert "semaphore: fix"
This reverts commit bf726eab3711cf192405d21688a4b21e07b6188a, as it has
been reported to cause a regression with processes stuck in __down(),
apparently because some missing wakeup.
Quoth Sven Wegener:
"I'm currently investigating a regression that has showed up with my
last git pull yesterday. Bisecting the commits showed bf726e
"semaphore: fix" to be the culprit, reverting it fixed the issue.
Symptoms: During heavy filesystem usage (e.g. a kernel compile) I get
several compiler processes in uninterruptible sleep, blocking all i/o
on the filesystem. System is an Intel Core 2 Quad running a 64bit
kernel and userspace. Filesystem is xfs on top of lvm. See below for
the output of sysrq-w."
See
http://lkml.org/lkml/2008/5/10/45
for full report.
In the meantime, we can just fix the BKL performance regression by
reverting back to the good old BKL spinlock implementation instead,
since any sleeping lock will generally perform badly, especially if it
tries to be fair.
Reported-by: Sven Wegener <sven.wegener at stealer.net>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 39f004ba27fcd2431030a3bb3c949fa3f93fa4ca
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 10 19:52:43 2008 -0700
Make <asm-x86/spinlock.h> use ACCESS_ONCE()
..instead of cooking up its own uglier local version of it.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9c3cdc1f83a6e07092392ff4aba6466517dbd1d0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 10 19:51:16 2008 -0700
Move ACCESS_ONCE() to <linux/compiler.h>
It actually makes much more sense there, and we do tend to need it for
non-RCU usage too. Moving it to <linux/compiler.h> will allow some
other cases that have open-coded the same logic to use the same helper
function that RCU has used.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 82fd866701881623d69fe280dbac06ddff1fdef9
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 1 03:46:22 2008 +0200
x86: rdc: leds build/config fix
select NEW_LEDS for now until the Kconfig dependencies have been
fixed.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5c3a121d52b30a1e53cdaa802fa1965fcd243164
Author: Vaidyanathan Srinivasan <svaidy at linux.vnet.ibm.com>
Date: Mon May 5 19:22:15 2008 +0530
x86: sysfs cpu?/topology is empty in 2.6.25 (32-bit Intel system)
System topology on intel based system needs to be exported
for non-numa case as well.
All parts of asm-i386/topology.h has come under
#ifdef CONFIG_NUMA after the merge to asm-x86/topology.h
/sys/devices/system/cpu/cpu?/topology/* is populated based on
ENABLE_TOPO_DEFINES
The sysfs cpu topology is not being populated on my dual socket
dual core xeon 5160 processor based (x86 32 bit) system.
CONFIG_NUMA is not set in my case yet the topology is relevant
and useful.
irqbalance daemon application depends on topology to build the
cpus and package list and it fails on Fedora9 beta since the
sysfs topology was not being populated in the 2.6.25 kernel.
I am not sure if it was intentional to not define ENABLE_TOPO_DEFINES
for non-numa systems.
This fix has been tested on the above mentioned dual core, dual socket
system.
Signed-off-by: Vaidyanathan Srinivasan <svaidy at linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: stable at kernel.org
commit eb2b4e682a6d5b4779a7f1a6a8419982919795f6
Author: Simon Holm Thøgersen <odie at cs.aau.dk>
Date: Mon May 5 15:45:28 2008 +0200
x86: revert commit 709f744 ("x86: bitops asm constraint fixes")
709f744 causes my computer to freeze during the start up of X and my
login manger (GDM). It gets to the point where it has shown the default
X mouse cursor logo (a big X / cross) and does not respond to anything
from that point on.
This worked fine before 709f744, and it works fine with 709f744
reverted on top of Linus' current tree (f74d505). The revert had
conflicts, as far as I can tell due to white space changes. The diff I
ended up with is below.
It is 100% reproducible.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 9096bd7a66efbe406910365c5206a32eed3875af
Author: Helge Wagner <Helge.Wagner at gefanuc.com>
Date: Tue Apr 29 14:20:40 2008 +0200
x86: restrict keyboard io ports reservation to make ipmi driver work
On some of our (single board computer) boards (x86) we are using an
IPMI controller that uses I/O ports 0x62 and 0x66 for a KCS (keyboard
controller style) IPMI system interface.
Trying to load the openipmi driver fails, because the ports
(0x62/0x66) are reserved for keyboard. keyboard reserves the full
range 0x60-0x6F while it doesn't need to.
Reserve only ports 0x60 and 0x64 for the legacy PS/2 i8042 keyboad
controller instead of 0x60-0x6F to allow the openipmi driver to work.
[ tglx: added 64bit fixup ]
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit fd3c3ed5d1e3ceb37635cbe6d220ab94aae0781d
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Wed May 7 12:09:52 2008 -0700
x86: fix fpu restore from sig return
If the task never used fpu, initialize the fpu before restoring the FP
state from the signal handler context. This will allocate the fpu
state, if the task never needed it before.
Reported-and-bisected-by: Eric Sesterhenn <snakebyte at gmx.de>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Tested-by: Eric Sesterhenn <snakebyte at gmx.de>
Cc: Frederik Deweerdt <deweerdt at free.fr>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 0646153921892cc7a81320a6920beaca06b3e9f0
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Sun May 4 13:41:02 2008 -0700
x86: remove spew print out about bus to node mapping
Jeff Garzik pointed out that this printout is not needed.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5ecddcebfb7c737fe36494c77bd99ad045eab5ae
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Thu May 8 16:38:11 2008 +0200
x86: revert printk format warning change which is for linux-next
commit 62179849b40aded9e727cca5006627a1c4d6446e
x86: fix setup printk format warning
is for linux-next and not for .26
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c07c6053c41f736711ed856aa377007078c7c396
Author: David S. Miller <davem at davemloft.net>
Date: Sat May 10 00:31:28 2008 -0700
sparc32: Don't twiddle PT_DTRACE in exec.
That bit isn't used on this platform.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5
Merge: 5bf6c6e30d8b71d092e8830208e182d84b907fcd da109897a142dd017172c0ce7abf0be8646f7109
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Fri May 9 23:24:09 2008 +0100
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
commit 5bf6c6e30d8b71d092e8830208e182d84b907fcd
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Fri May 9 08:56:54 2008 +0100
[ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier.
A lot of stuff in spitz/akita/etc. depends on corgi_ssp to be initialised
early. However corgi_ssp initialisation fails, because at that time pxa*-ssp
devices don't have drivers. Move ssp earlier in the makefile so they are
registered before corgi-ssp.
Also move sleep/suspend and cpu-freq to more logical places
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 005b1f7495e812b99b73de5adbc73afd7a1cbcaf
Author: Jeff Garzik <jeff at garzik.org>
Date: Fri May 9 15:00:55 2008 -0400
[libata] revert new check-ready Status register logic
This behavior differs across multiple controllers, so we cannot use
common logic for all controllers.
Revert back to the basic common behavior, and specific drivers will
be updated from here to take into account the unusual Status return
values.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3ed43c745d2ce0c4ca15ad406285d1cc7e8ceec3
Merge: 26c5e98e88a6126adef2ddce21899e5afe823a2b 45828b812ddb608ddf83eff11601f62b726d13ab
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 9 10:34:00 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (21 commits)
Blackfin Serial Driver: abstract away DLAB differences into header
Blackfin Serial Driver: macro away the IER differences between processors
[Blackfin] arch: remove useless IRQ_SW_INT defines
[Blackfin] arch: protect linux/usb/musb.h include until the driver gets mainlined
[Blackfin] arch: protect linux/usb/isp1362.h include until the driver gets mainlined
[Blackfin] arch: add EBIU supporting for BF54x EZKIT SMSC LAN911x/LAN921x families embedded ethernet driver
[Blackfin] arch: Set spi flash partition on bf527 as like bf548.
[Blackfin] arch: fix bug - Remove module will not free L1 memory used
[Blackfin] arch: fix wrong header name in comment
[Blackfin] arch: Fix BUG - spi flash on bf527 ezkit would fail at mount
[Blackfin] arch: add twi_lcd and twi_keypad i2c board info to bf527-ezkit
[Blackfin] arch: Add physmap partition for BF527-EZkit
[Blackfin] arch: fix gdb testing regression
[Blackfin] arch: disable single stepping when delivering a signal
[Blackfin] arch: Delete unused (copied from m68k) entries in asm-offsets.c.
[Blackfin] arch: In the double fault handler, set up the PT_RETI slot
[Blackfin] arch: Support for CPU_FREQ and NOHZ
[Blackfin] arch: Functional power management support: Add CPU and platform voltage scaling support
[Blackfin] arch: fix bug - breaking the atomic sections code.
[Blackfin] arch: Equalize include files: Add VR_CTL masks
...
commit 26c5e98e88a6126adef2ddce21899e5afe823a2b
Merge: a9545ee3c8153e133556aaaa8110337ca3f864dc af4b3c355cbd38703471e55d11f42d8640db4118
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 9 08:10:09 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] fix build warning
[CIFS] Fixed build warning in is_ip
[CIFS] cleanup cifsd completion
[CIFS] Remove over-indented code in find_unc().
[CIFS] fix typo
[CIFS] Remove duplicate call to mode_to_acl
[CIFS] convert usage of implicit booleans to bool
[CIFS] fixed compatibility issue with samba refferal request
[CIFS] Fix statfs formatting
[CIFS] Adds to dns_resolver checking if the server name is an IP addr and skipping upcall in this case.
[CIFS] Fix spelling mistake
[CIFS] Update cifs version number
commit a9545ee3c8153e133556aaaa8110337ca3f864dc
Merge: c20b4b69f774896623a8ad87d974982bc89af7ed 9731e287e08b804592191d8bffaad023154af2aa
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 9 08:07:58 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (37 commits)
SH: catch negative denormal_subf1() retval in denormal_add()
sh: Fix DMAC base address for SH7709S
sh: update smc91x platform data for se7206.
sh: Stub in cpu_to_node() and friends for NUMA build.
sh: intc register modify fix
sh: no high level trigger on some sh3 cpus
sh: clean up sh7710 and sh7720 intc tables
sh: add interrupt ack code to sh3
sh: unify external irq pin code for sh3
sh-sci: avoid writing to nonexistent registers
sh-sci: sh7722 lacks scsptr registers
sh-sci: improve sh7722 support
sh: reset hardware from early printk
sh: drain and wait for early printk
sh: use sci_out() for early printk
sh: add memory resources to /proc/iomem
sh: add kernel bss resource
sh: fix sh7705 interrupt vector typo
sh: update smc91x platform data for se7722
sh: update smc91x platform data for MigoR
...
commit c20b4b69f774896623a8ad87d974982bc89af7ed
Merge: d9a9a23ff2b00463f25e880d13364938b321ab8a 67412f0e78dfbbbcb36e631d9df70c6c559d60d4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 9 08:07:21 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] hmac: Avoid calling virt_to_page on key
commit d9a9a23ff2b00463f25e880d13364938b321ab8a
Merge: 9b013c2820c409ff84871e55e407ec2181782773 53962ecf6ebbdb5b15a8b35fbefe34430eb25609
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 9 08:06:31 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (23 commits)
[POWERPC] Remove leftover printk in isa-bridge.c
[POWERPC] Remove duplicate #include
[POWERPC] Initialize lockdep earlier
[POWERPC] Document when printk is useable
[POWERPC] Fix bogus paca->_current initialization
[POWERPC] Fix of_i2c include for module compilation
[POWERPC] Make default cputable entries reflect selected CPU family
[POWERPC] spufs: lockdep annotations for spufs_dir_close
[POWERPC] spufs: don't requeue victim contex in find_victim if it's not in spu_run
[POWERPC] 4xx: Fix PCI mem in sequoia DTS
[POWERPC] 4xx: Add endpoint support to 4xx PCIe driver
[POWERPC] 4xx: Fix problem with new TLB storage attibute fields on 440x6 core
[POWERPC] spufs: spu_create should send inotify IM_CREATE event
[POWERPC] spufs: handle faults while the context switch pending flag is set
[POWERPC] spufs: fix concurrent delivery of class 0 & 1 exceptions
[POWERPC] spufs: try to route SPU interrupts to local node
[POWERPC] spufs: set SPU_CONTEXT_SWITCH_PENDING before synchronising SPU irqs
[POWERPC] spufs: don't acquire state_mutex interruptible while performing callback
[POWERPC] spufs: update master runcntl with context lock held
[POWERPC] spufs: fix post-stopped update of MFC_CNTL register
...
commit 9b013c2820c409ff84871e55e407ec2181782773
Author: Christoph Hellwig <hch at lst.de>
Date: Fri May 9 14:44:02 2008 +0200
m32r: use generic sys_pipe
m32r can use the generic sys_pipe implementation.
The current sys_pipe implementation on m32r only differes from the
generic one by passing a lot of additional unused registers to sys_pipe.
Reviewed and tested by Hirokazu Takata.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Acked-by: Hirokazu Takata <takata at linux-m32r.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 41d88d55b2891203e98d1dc0acab949ffd0af078
Author: Christoph Hellwig <hch at lst.de>
Date: Fri May 9 12:41:17 2008 +0200
cris: kill sys_pipe implementation
The cris implementation of sys_pipe only differs from the generic one
by taking the BKL before calling do_pipe which isn't not nessecary.
Just kill the cris implementation and use the generic one.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a8f43ee7e108cecf68cac652d0a3aeedb8131220
Merge: 91e37a793b5a9436a2d12b2f0a8f52db3a133e1d 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 9 08:01:19 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sit: Add missing kfree_skb() on pskb_may_pull() failure.
tipc: Increase buffer header to support worst-case device
commit 91e37a793b5a9436a2d12b2f0a8f52db3a133e1d
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 9 16:25:28 2008 +1000
module: don't ignore vermagic string if module doesn't have modversions
Linus found a logic bug: we ignore the version number in a module's
vermagic string if we have CONFIG_MODVERSIONS set, but modversions
also lets through a module with no __versions section for modprobe
--force (with tainting, but still).
We should only ignore the start of the vermagic string if the module
actually *has* crcs to check. Rather than (say) having an
entertaining hissy fit and creating a config option to work around the
buggy code.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a5dd69707424a35d2d2cc094e870f595ad61e916
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 9 16:24:21 2008 +1000
module: be more picky about allowing missing module versions
We allow missing __versions sections, because modprobe --force strips
it. It makes less sense to allow sections where there's no version
for a specific symbol the module uses, so disallow that.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6c2545eefffc452e52302c96c955d9aa26353aa9
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 9 16:23:17 2008 +1000
module: put modversions in vermagic
Don't allow a module built without versions altogether to be inserted
into a kernel which expects modversions.
modprobe --force will strip vermagic as well as modversions, so it
won't be effected, but this will make sure that a
non-CONFIG_MODVERSIONS module won't be accidentally inserted into a
CONFIG_MODVERSIONS kernel.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit da109897a142dd017172c0ce7abf0be8646f7109
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Sat Apr 26 14:48:11 2008 -0400
[ARM] Orion: clean up addr-map.c after window setting code purge
This patch cleans up Orion's addr-map.c a bit after all peripheral
window programming code has been moved out into the relevant drivers.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi at marvell.com>
Acked-by: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit b8c15a6084e84497e31e75c9cededb73af768632
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Sat Apr 26 14:48:11 2008 -0400
[ARM] Orion: pass proper t_clk into mv643xx_eth
Pass the Orion TCLK tick rate into the ethernet driver.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit d236f5a5f77183c270223e8816804e7763463282
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Sat Apr 26 14:48:11 2008 -0400
[ARM] Orion: use mv643xx_eth driver mbus window handling
Make the Orion 5x platform code use the mbus window handling code
that's in the mv643xx_eth driver, instead of programming the GigE
block's mbus window registers by hand.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi at marvell.com>
Acked-by: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit 9731e287e08b804592191d8bffaad023154af2aa
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Fri May 9 20:05:10 2008 +0900
SH: catch negative denormal_subf1() retval in denormal_add()
'ix' is unsigned but denormal_subf1() may return a negative int.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 53962ecf6ebbdb5b15a8b35fbefe34430eb25609
Author: Nate Case <ncase at xes-inc.com>
Date: Fri May 9 02:41:17 2008 +1000
[POWERPC] Remove leftover printk in isa-bridge.c
This printk() appears twice in the same function. Only the latter one
in the inval_range: section appears to be legitimate.
Signed-off-by: Nate Case <ncase at xes-inc.com>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 1c4a8119123e7e064344588d9a059bc0bb24e1ae
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Thu May 8 23:34:29 2008 +1000
[POWERPC] Remove duplicate #include
Remove duplicate #include of <asm/prom.h> in
arch/powerpc/kernel/btext.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f2fd25131b5a9c802faa1de1e9b5f1b06d16eec3
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Wed May 7 10:25:34 2008 +1000
[POWERPC] Initialize lockdep earlier
This moves lockdep_init() to before udbg_early_init() as the later
can call things that acquire spinlocks etc... This also makes printk
safer to use earlier.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 24d9649574fbe591fdfa6b00893d4096f513e539
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Wed May 7 10:00:56 2008 +1000
[POWERPC] Document when printk is useable
When debugging early boot problems, it's common to sprinkle printk's
all over the place. However, on 64-bit powerpc, this can lead to
memory corruption if done too early due to the PACA pointer and
lockdep core not being initialized.
This adds some comments to early_setup() that document when it is
safe to do so in order to save time for whoever has to debug that
stuff next.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 1b70c5a6491dd02263e6d104b72d9b536f987021
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Wed May 7 10:00:55 2008 +1000
[POWERPC] Fix bogus paca->_current initialization
When doing lockdep, I had two patches to initialize paca->_current
early, one bogus, and one correct. Unfortunately both got merged
as the bad one ended up being part of the main lockdep patch by
mistake. This causes memory corruption at boot. This removes
the offending code.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 8af302e2dc91d4229968b8eedd4b45c0dd9fc717
Author: Jochen Friedrich <jochen at scram.de>
Date: Wed May 7 04:40:01 2008 +1000
[POWERPC] Fix of_i2c include for module compilation
Remove #ifdef CONFIG_OF_I2C as this breaks module compilation.
Drivers using this header should depend on OF_I2C anyways, so
there's no need to make this conditional.
Signed-off-by: Jochen Friedrich <jochen at scram.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 76bc080ef5a34aedb63e1691f28c6b42f3468e4e
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon May 5 15:22:27 2008 +1000
[POWERPC] Make default cputable entries reflect selected CPU family
Changes the cputable so that various CPU families that have an exclusive
CONFIG_ option have a more sensible default entry to use if the specific
processor hasn't been identified.
This makes the kernel more generally useful when booted on an unknown
PVR for things like new 4xx variants.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92
Merge: 02539d71fa98d5737bb668b02286c76241e4bac9 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5
Author: Paul Mackerras <paulus at samba.org>
Date: Fri May 9 20:12:06 2008 +1000
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
commit cdf7da899d840d47e075ff3bd761290653c68b77
Author: Steve Glendinning <steve.glendinning at smsc.com>
Date: Tue May 6 11:36:27 2008 +0100
sh: Fix DMAC base address for SH7709S
On SH7709S, DMAC can be found at 0xa4000020 (as with most of
the other sh3 cpu subtypes).
Split out definition of DMAC base address from definitions of
DMTE irqs.
Signed-off-by: Steve Glendinning <steve.glendinning at smsc.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 8 23:40:26 2008 -0700
sit: Add missing kfree_skb() on pskb_may_pull() failure.
Noticed by Paul Marks <paul at pmarks.net>.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f11c9c2fd9ab1732acd577bcf08a4a2be7f9aa65
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri May 9 14:13:17 2008 +0900
sh: update smc91x platform data for se7206.
Follows the se7722 change.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit f08269d3ecbb9300aeeb2d4272580f660afe9db9
Author: Allan Stephens <allan.stephens at windriver.com>
Date: Thu May 8 21:38:24 2008 -0700
tipc: Increase buffer header to support worst-case device
This patch increases the headroom TIPC reserves in each sk_buff
to accommodate the largest possible link level device header.
Signed-off-by: Allan Stephens <allan.stephens at windriver.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6cd5a86b56ec8fc8651c043bdb05ea0c662fb704
Author: Robert Reif <reif at earthlink.net>
Date: Thu May 8 21:37:30 2008 -0700
sparc video: remove open boot prom code
Replace remaining open boot prom code with of.
Boot tested on sparc32 and compile tested on sparc64.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit af4b3c355cbd38703471e55d11f42d8640db4118
Author: Steve French <sfrench at us.ibm.com>
Date: Fri May 9 03:48:05 2008 +0000
[CIFS] fix build warning
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 28a4acb48586dc21d2d14a75a7aab7be78b7c83b
Merge: 89f92d6425b099538932e9b881588f87ef9f3184 e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 19:03:26 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
net: Added ASSERT_RTNL() to dev_open() and dev_close().
can: Fix can_send() handling on dev_queue_xmit() failures
netns: Fix arbitrary net_device-s corruptions on net_ns stop.
netfilter: Kconfig: default DCCP/SCTP conntrack support to the protocol config values
netfilter: nf_conntrack_sip: restrict RTP expect flushing on error to last request
macvlan: Fix memleak on device removal/crash on module removal
net/ipv4: correct RFC 1122 section reference in comment
tcp FRTO: SACK variant is errorneously used with NewReno
e1000e: don't return half-read eeprom on error
ucc_geth: Don't use RX clock as TX clock.
cxgb3: Use CAP_SYS_RAWIO for firmware
pcnet32: delete non NAPI code from driver.
fs_enet: Fix a memory leak in fs_enet_mdio_probe
[netdrvr] eexpress: IPv6 fails - multicast problems
3c59x: use netstats in net_device structure
3c980-TX needs EXTRA_PREAMBLE
fix warning in drivers/net/appletalk/cops.c
e1000e: Add support for BM PHYs on ICH9
uli526x: fix endianness issues in the setup frame
uli526x: initialize the hardware prior to requesting interrupts
...
commit 89f92d6425b099538932e9b881588f87ef9f3184
Merge: 8d539108560ec121d59eee05160236488266221c dc5dc7e6d71ca9fd1ea01a1418150af3b2937489
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 19:03:19 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Fix SA_ONSTACK signal handling.
commit 8d539108560ec121d59eee05160236488266221c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 18:41:48 2008 -0700
Revert "PCI: remove default PCI expansion ROM memory allocation"
This reverts commit 9f8daccaa05c14e5643bdd4faf5aed9cc8e6f11e, which was
reported to break X startup (xf86-video-ati-6.8.0). See
http://bugs.freedesktop.org/show_bug.cgi?id=15523
for details.
Reported-by: Laurence Withers <l at lwithers.me.uk>
Cc: Gary Hade <garyhade at us.ibm.com>
Cc: Greg KH <greg at kroah.com>
Cc: Jan Beulich <jbeulich at novell.com>
Cc: "Jun'ichi Nomura" <j-nomura at ce.jp.nec.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7c5e628f95b440b69332b1ed3eb112648fc8f7ff
Author: Igor Mammedov <niallain at gmail.com>
Date: Thu May 8 20:48:42 2008 +0000
[CIFS] Fixed build warning in is_ip
Signed-off-by: Igor Mammedov <niallain at gmail.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit c4f51b4662074c6ee26c972126a317c05f65be06
Merge: f589274533eb94e0217acc1db6240ce6e621bb56 46151122e0a2e80e5a6b2889f595e371fe2b600d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 11:31:07 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
sched: fix weight calculations
semaphore: fix
commit f589274533eb94e0217acc1db6240ce6e621bb56
Merge: 625fc3a37511cbecfe1253867fe105c28d6a95f0 e3a2efa67a029453b8098dba179ec2d9d8df612e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 10:58:45 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc at91 minor bug fixes
[ALSA] soc - at91-pcm - Fix line wrapping
pcspkr: fix dependancies
commit 625fc3a37511cbecfe1253867fe105c28d6a95f0
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Thu May 8 22:48:31 2008 +0800
Remove duplicated include in net/sunrpc/svc.c
<linux/sched.h> we included twice.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 19566ca6dc26600bae4b75701d4dced8d8540f16
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Thu May 8 22:36:27 2008 +0800
fs/proc/task_mmu.c: remove duplicated include files
Removed duplicated include files <linux/ptrace.h> and <linux/seq_file.h> in
fs/proc/task_mmu.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f7c83a0aaa772f8d0189fa197d77c762caaa367a
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 09:48:07 2008 +0200
Fix drivers/media build for modular builds
Fix allmodconfig build bug introduced in latest -git by commit
7c91f0624a9 ("V4L/DVB(7767): Move tuners to common/tuners"):
LD kernel/built-in.o
LD drivers/built-in.o
ld: drivers/media/built-in.o: No such file: No such file or directory
which happens if all media drivers are modular:
http://redhat.com/~mingo/misc/config-Wed_Apr_30_09_24_48_CEST_2008.bad
In that case there's no obj-y rule connecting all the built-in.o files and
the link tree breaks.
The fix is to add a guaranteed obj-y rule for the core vmlinux to build.
(which results in an empty object file if all media drivers are modular)
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Acked-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8e1bf9ffb1aca693e3cf4a4f7144c8f70c8a08b0
Merge: 148c69b4b0ec267b08d3619651ae4a10a1768b04 12137c593d127c6c1a3eb050674da047682badaf
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 10:50:34 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Wait for async events to finish before destroying QP
IB/ipath: Fix SDMA error recovery in absence of link status change
IB/ipath: Need to always request and handle PIO avail interrupts
IB/ipath: Fix count of packets received by kernel
IB/ipath: Return the correct opcode for RDMA WRITE with immediate
IB/ipath: Fix bug that can leave sends disabled after freeze recovery
IB/ipath: Only increment SSN if WQE is put on send queue
IB/ipath: Only warn about prototype chip during init
RDMA/cxgb3: Fix severe limit on userspace memory registration size
RDMA/cxgb3: Don't add PBL memory to gen_pool in chunks
commit 148c69b4b0ec267b08d3619651ae4a10a1768b04
Author: David Howells <dhowells at redhat.com>
Date: Wed May 7 15:31:54 2008 +0100
MN10300: Make cpu_relax() invoke barrier()
Make cpu_relax() invoke barrier() to be the same as other arches.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7a34912d90c17a90d9fad12c4c51833b4e70707b
Merge: 0f1bce41fed02e45f31c2409f29e69e1fedebcdc 75065ff619e42fe35178eda863cbcddd57776794
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 10:48:36 2008 -0700
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "relay: fix splice problem"
docbook: fix bio missing parameter
block: use unitialized_var() in bio_alloc_bioset()
block: avoid duplicate calls to get_part() in disk stat code
cfq-iosched: make io priorities inherit CPU scheduling class as well as nice
block: optimize generic_unplug_device()
block: get rid of likely/unlikely predictions in merge logic
vfs: splice remove_suid() cleanup
cfq-iosched: fix RCU race in the cfq io_context destructor handling
block: adjust tagging function queue bit locking
block: sysfs store function needs to grab queue_lock and use queue_flag_*()
commit 0f1bce41fed02e45f31c2409f29e69e1fedebcdc
Merge: da1ba891f22835db9a2c349315c3763e9f4e4e67 9afadc4b1fd25337003832c9a4668f9bd42cdda9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 10:48:03 2008 -0700
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: Fix memory corruption when fs mounted with noadinicb option
udf: Make udf exportable
udf: fs/udf/partition.c:udf_get_pblock() mustn't be inline
commit da1ba891f22835db9a2c349315c3763e9f4e4e67
Merge: 8b2cc917a02936c3ea7d8da46801c7b7b6233093 45e576b1c3d0020607b8666c0247164e92c7d719
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 8 10:47:39 2008 -0700
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] guest page hinting light
[S390] tty3270: fix put_char fail/success conversion.
[S390] compat ptrace cleanup
[S390] s390mach compile warning
[S390] cio: Fix parsing mechanism for blacklisted devices.
[S390] cio: Remove cio_msg kernel parameter.
[S390] s390-kvm: leave sie context on work. Removes preemption requirement
[S390] s390: Optimize user and work TIF check
commit 8b2cc917a02936c3ea7d8da46801c7b7b6233093
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue May 6 20:42:42 2008 -0700
drivers/scsi/dpt_i2o.c: fix build on alpha
alpha:
drivers/scsi/dpt_i2o.c:1997: error: implicit declaration of function 'adpt_alpha_info'
drivers/scsi/dpt_i2o.c: At top level:
drivers/scsi/dpt_i2o.c:2032: warning: conflicting types for 'adpt_alpha_info'
drivers/scsi/dpt_i2o.c:2032: error: static declaration of 'adpt_alpha_info' follows non-static declaration
drivers/scsi/dpt_i2o.c:1997: error: previous implicit declaration of 'adpt_alpha_info' was here
Due to a copy-n-paste error in drivers/scsi/dpti.h.
Fix that up and remove some of the many daft static-declarations-in-a-header
which this driver enjoys.
Cc: Miquel van Smoorenburg <miquels at cistron.nl>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5be7a4792a31df6f2cd44bfba8da467ea20a0642
Author: Paul Menage <menage at google.com>
Date: Tue May 6 20:42:41 2008 -0700
Fix cpuset sched_relax_domain_level control file
Due to a merge conflict, the sched_relax_domain_level control file was marked
as being handled by cpuset_read/write_u64, but the code to handle it was
actually in cpuset_common_file_read/write.
Since the value being written/read is in fact a signed integer, it should be
treated as such; this patch adds cpuset_read/write_s64 functions, and uses
them to handle the sched_relax_domain_level file.
With this patch, the sched_relax_domain_level can be read and written, and the
correct contents seen/updated.
Signed-off-by: Paul Menage <menage at google.com>
Cc: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Ingo Molnar <mingo at elte.hu>
Reviewed-by: Li Zefan <lizf at cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4ea33e2dc2dab10960877e1649ee527c033f42c0
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Tue May 6 20:42:39 2008 -0700
slub: fix atomic usage in any_slab_objects()
any_slab_objects() does an atomic_read on an atomic_long_t, this
fixes it to use atomic_long_read instead.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Pekka Enberg <penberg at cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ba719baeabbff5476eeb91c223e6921ba29e1490
Author: Ulrich Drepper <drepper at redhat.com>
Date: Tue May 6 20:42:38 2008 -0700
sys_pipe(): fix file descriptor leaks
Remember to close the files if copy_to_user() failed.
Spotted by dm.n9107 at gmail.com.
Signed-off-by: Ulrich Drepper <drepper at redhat.com>
Cc: DM <dm.n9107 at gmail.com>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c1236d31a1b9fc018b85e15a3e58e3601ddc90ae
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Tue May 6 20:42:37 2008 -0700
vt: fix canonical input in UTF-8 mode
For e.g. proper TTY canonical support, IUTF8 termios flag has to be set as
appropriate. Linux used to not care about setting that flag for VT TTYs.
This patch fixes that by activating it according to the current mode of the
VT, and sets the default value according to the vt.default_utf8 parameter.
Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Cc: Willy Tarreau <w at 1wt.eu>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ac7b77f13f2f33270276f88ad0f427e031552e04
Author: Mattia Dongili <malattia at linux.it>
Date: Tue May 6 20:42:35 2008 -0700
usb/asix: add Buffalo LUA-U2-GT 10/100/1000
The USB net adapter Buffalo LUA-U2-GT (0411:006e) carries a AX88178 chip.
Tested on the above HW.
Signed-off-by: Mattia Dongili <malattia at linux.it>
Acked-off-by: David Hollis <dhollis at davehollis.com>
Cc: Greg KH <greg at kroah.com>
Acked-by: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 32fb3ca8fda036936053b4bbfbc6589626cb2437
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue May 6 20:42:35 2008 -0700
sx.c: fix printk warnings on sparc32
drivers/char/sx.c: In function 'sx_set_real_termios':
drivers/char/sx.c:973: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
drivers/char/sx.c:999: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'tcflag_t'
drivers/char/sx.c:1012: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'tcflag_t'
sparc32 seems to use weird types for its tty things.
[ Fine by me but this is ancient debug and most of the debug in sx just
wants deleting eventually. - Alan ]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3168cb98be7199325de633052680098660ccaf84
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Tue May 6 20:42:33 2008 -0700
uml: fix inconsistence due to tty_operation change
'put_char' of 'struct tty_operations' has changed from 'void' into 'int'.
This can also shut up compiler warnings.
Cc: Jeff Dike <jdike at addtoit.com>
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cb6969e8cdef39e613b1755eff595f830b89bc82
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue May 6 20:42:32 2008 -0700
misc: fix integer as NULL pointer warnings
drivers/md/raid10.c:889:17: warning: Using plain integer as NULL pointer
drivers/media/video/cx18/cx18-driver.c:616:12: warning: Using plain integer as NULL pointer
sound/oss/kahlua.c:70:12: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Neil Brown <neilb at suse.de>
Cc: Mauro Carvalho Chehab <mchehab at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8594303a7abc1a117b1d91412ce9b3d77ed35d02
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Tue May 6 20:42:31 2008 -0700
fix irq flags for iuu_phoenix.c
The file drivers/usb/serial/iuu_phoenix.c uses "int" for flags. This can
cause hard to find bugs on some architectures. This patch converts the flags
to use "long" instead.
This bug was discovered by doing an allyesconfig make on the -rt kernel where
checks are done to ensure all flags are of size sizeof(long).
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9a0f4aea878315ba87cb8a4d0dddc67832218e3f
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Tue May 6 20:42:30 2008 -0700
fix irq flags in rtc-ds1511
The file in drivers/rtc/rtc-ds1551.c uses "int" for flags. This can cause
hard to find bugs on some architectures. This patch converts the flags to use
"long" instead.
This bug was discovered by doing an allyesconfig make on the -rt kernel where
checks are done to ensure all flags are of size sizeof(long).
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a8b1ecf3d5c48ebde9fed61c7a682b2270e09d2b
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Tue May 6 20:42:29 2008 -0700
fix irq flags in saa7134
Some files in the drivers/media/video/saa7134 directory uses "int" for flags.
This can cause hard to find bugs on some architectures. This patch converts
the flags to use "long" instead.
This bug was discovered by doing an allyesconfig make on the -rt kernel where
checks are done to ensure all flags are of size sizeof(long).
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Acked-by: Mauro Carvalho Chehab <mchehab at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a1f2aa1be2f7a6883ba46faa53ed82595dee2a06
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Tue May 6 20:42:28 2008 -0700
fix irq flags in mac80211 code
A file in the net/mac80211 directory uses "int" for flags. This can cause
hard to find bugs on some architectures. This patch converts the flags to use
"long" instead.
This bug was discovered by doing an allyesconfig make on the -rt kernel where
checks are done to ensure all flags are of size sizeof(long).
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Cc: "John W. Linville" <linville at tuxdriver.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 55d7b68996a5064f011d681bca412b6281d2f711
Author: Tetsuo Handa <penguin-kernel at i-love.sakura.ne.jp>
Date: Tue May 6 20:42:27 2008 -0700
serial: access after NULL check in uart_flush_buffer()
I noticed that
static void uart_flush_buffer(struct tty_struct *tty)
{
struct uart_state *state = tty->driver_data;
struct uart_port *port = state->port;
unsigned long flags;
/*
* This means you called this function _after_ the port was
* closed. No cookie for you.
*/
if (!state || !state->info) {
WARN_ON(1);
return;
}
is too late for checking state != NULL.
Signed-off-by: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3f9827bc05581b6bb34ab0c6b5d8e028f71b4e78
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Tue May 6 20:42:26 2008 -0700
Kconfig: improved help for CONFIG_ACCESSIBILITY
Add a small explanation of what accessibility is.
Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc38e2ad53ca27968919dea6d7fa60575782d5a6
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu May 8 16:50:39 2008 +0100
[ARM] pxa: Fix RCSR handling
Related to d3930614e68bdf83a120d904c039a64e9f75dba1.
RCSR is only present on PXA2xx CPUs, not on PXA3xx CPUs. Therefore,
we should not be unconditionally writing to RCSR from generic code.
Since we now clear the RCSR status from the SoC specific PXA PM code
and before reset in the arch_reset() function, the duplication in
the corgi, poodle, spitz and tosa code can be removed.
Acked-by: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 46151122e0a2e80e5a6b2889f595e371fe2b600d
Author: Mike Galbraith <efault at gmx.de>
Date: Thu May 8 17:00:42 2008 +0200
sched: fix weight calculations
The conversion between virtual and real time is as follows:
dvt = rw/w * dt <=> dt = w/rw * dvt
Since we want the fair sleeper granularity to be in real time, we actually
need to do:
dvt = - rw/w * l
This bug could be related to the regression reported by Yanmin Zhang:
| Comparing with kernel 2.6.25, sysbench+mysql(oltp, readonly) has lots
| of regressions with 2.6.26-rc1:
|
| 1) 8-core stoakley: 28%;
| 2) 16-core tigerton: 20%;
| 3) Itanium Montvale: 50%.
Reported-by: "Zhang, Yanmin" <yanmin_zhang at linux.intel.com>
Signed-off-by: Mike Galbraith <efault at gmx.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit bf726eab3711cf192405d21688a4b21e07b6188a
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 8 11:53:48 2008 +0200
semaphore: fix
Yanmin Zhang reported:
| Comparing with kernel 2.6.25, AIM7 (use tmpfs) has more th
| regression under 2.6.26-rc1 on my 8-core stoakley, 16-core tigerton,
| and Itanium Montecito. Bisect located the patch below:
|
| 64ac24e738823161693bf791f87adc802cf529ff is first bad commit
| commit 64ac24e738823161693bf791f87adc802cf529ff
| Author: Matthew Wilcox <matthew at wil.cx>
| Date: Fri Mar 7 21:55:58 2008 -0500
|
| Generic semaphore implementation
|
| After I manually reverted the patch against 2.6.26-rc1 while fixing
| lots of conflicts/errors, aim7 regression became less than 2%.
i reproduced the AIM7 workload and can confirm Yanmin's findings that
-.26-rc1 regresses over .25 - by over 67% here.
Looking at the workload i found and fixed what i believe to be the real
bug causing the AIM7 regression: it was inefficient wakeup / scheduling
/ locking behavior of the new generic semaphore code, causing suboptimal
performance.
The problem comes from the following code. The new semaphore code does
this on down():
spin_lock_irqsave(&sem->lock, flags);
if (likely(sem->count > 0))
sem->count--;
else
__down(sem);
spin_unlock_irqrestore(&sem->lock, flags);
and this on up():
spin_lock_irqsave(&sem->lock, flags);
if (likely(list_empty(&sem->wait_list)))
sem->count++;
else
__up(sem);
spin_unlock_irqrestore(&sem->lock, flags);
where __up() does:
list_del(&waiter->list);
waiter->up = 1;
wake_up_process(waiter->task);
and where __down() does this in essence:
list_add_tail(&waiter.list, &sem->wait_list);
waiter.task = task;
waiter.up = 0;
for (;;) {
[...]
spin_unlock_irq(&sem->lock);
timeout = schedule_timeout(timeout);
spin_lock_irq(&sem->lock);
if (waiter.up)
return 0;
}
the fastpath looks good and obvious, but note the following property of
the contended path: if there's a task on the ->wait_list, the up() of
the current owner will "pass over" ownership to that waiting task, in a
wake-one manner, via the waiter->up flag and by removing the waiter from
the wait list.
That is all and fine in principle, but as implemented in
kernel/semaphore.c it also creates a nasty, hidden source of contention!
The contention comes from the following property of the new semaphore
code: the new owner owns the semaphore exclusively, even if it is not
running yet.
So if the old owner, even if just a few instructions later, does a
down() [lock_kernel()] again, it will be blocked and will have to wait
on the new owner to eventually be scheduled (possibly on another CPU)!
Or if another task gets to lock_kernel() sooner than the "new owner"
scheduled, it will be blocked unnecessarily and for a very long time
when there are 2000 tasks running.
I.e. the implementation of the new semaphores code does wake-one and
lock ownership in a very restrictive way - it does not allow
opportunistic re-locking of the lock at all and keeps the scheduler from
picking task order intelligently.
This kind of scheduling, with 2000 AIM7 processes running, creates awful
cross-scheduling between those 2000 tasks, causes reduced parallelism, a
throttled runqueue length and a lot of idle time. With increasing number
of CPUs it causes an exponentially worse behavior in AIM7, as the chance
for a newly woken new-owner task to actually run anytime soon is less
and less likely.
Note that it takes just a tiny bit of contention for the 'new-semaphore
catastrophy' to happen: the wakeup latencies get added to whatever small
contention there is, and quickly snowball out of control!
I believe Yanmin's findings and numbers support this analysis too.
The best fix for this problem is to use the same scheduling logic that
the kernel/mutex.c code uses: keep the wake-one behavior (that is OK and
wanted because we do not want to over-schedule), but also allow
opportunistic locking of the lock even if a wakee is already "in
flight".
The patch below implements this new logic. With this patch applied the
AIM7 regression is largely fixed on my quad testbox:
# v2.6.25 vanilla:
..................
Tasks Jobs/Min JTI Real CPU Jobs/sec/task
2000 56096.4 91 207.5 789.7 0.4675
2000 55894.4 94 208.2 792.7 0.4658
# v2.6.26-rc1-166-gc0a1811 vanilla:
...................................
Tasks Jobs/Min JTI Real CPU Jobs/sec/task
2000 33230.6 83 350.3 784.5 0.2769
2000 31778.1 86 366.3 783.6 0.2648
# v2.6.26-rc1-166-gc0a1811 + semaphore-speedup:
...............................................
Tasks Jobs/Min JTI Real CPU Jobs/sec/task
2000 55707.1 92 209.0 795.6 0.4642
2000 55704.4 96 209.0 796.0 0.4642
i.e. a 67% speedup. We are now back to within 1% of the v2.6.25
performance levels and have zero idle time during the test, as expected.
Btw., interactivity also improved dramatically with the fix - for
example console-switching became almost instantaneous during this
workload (which after all is running 2000 tasks at once!), without the
patch it was stuck for a minute at times.
There's another nice side-effect of this speedup patch, the new generic
semaphore code got even smaller:
text data bss dec hex filename
1241 0 0 1241 4d9 semaphore.o.before
1207 0 0 1207 4b7 semaphore.o.after
(because the waiter.up complication got removed.)
Longer-term we should look into using the mutex code for the generic
semaphore code as well - but i's not easy due to legacies and it's
outside of the scope of v2.6.26 and outside the scope of this patch as
well.
Bisected-by: "Zhang, Yanmin" <yanmin_zhang at linux.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8d4a4300854f3971502e81dacd930704cb88f606
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Thu May 8 09:18:43 2008 +0200
x86: cleanup PAT cpu validation
Move the scattered checks for PAT support to a single function. Its
moved to addon_cpuid_features.c as this file is shared between 32 and
64 bit.
Remove the manipulation of the PAT feature bit and just disable PAT in
the PAT layer, based on the PAT bit provided by the CPU and the
current CPU version/model white list.
Change the boot CPU check so it works on Voyager somewhere in the
future as well :) Also panic, when a secondary has PAT disabled but
the primary one has alrady switched to PAT. We have no way to undo
that.
The white list is kept for now to ensure that we can rely on known to
work CPU types and concentrate on the software induced problems
instead of fighthing CPU erratas and subtle wreckage caused by not yet
verified CPUs. Once the PAT code has stabilized enough, we can remove
the white list and open the can of worms.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit cb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0
Author: Andres Salomon <dilinger at queued.net>
Date: Wed May 7 13:07:38 2008 -0700
x86: geode: define geode_has_vsa2() even if CONFIG_MGEODE_LX is not set
We want drivers to be able to use geode_has_vsa2 without having to worry
about what model geode is being compiled for. This patch ensures that
geode_has_vsa2 is always defined.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 547acec7ecc32b14c2740de3f32ce7d1b36a0f69
Author: Andres Salomon <dilinger at queued.net>
Date: Wed May 7 13:07:37 2008 -0700
x86: GEODE: cache results from geode_has_vsa2() and uninline
This moves geode_has_vsa2 into a .c file, caches the result we get from
the VSA virtual registers, and causes the function to no longer be inline.
[akpm at linux-foundation.org: cleanup]
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ac44cc96fbc8f44c056fa37573e8447eec512b10
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Thu May 8 13:58:01 2008 +0200
x86: revert geode config dependency
commit e26a28d190304d910ee49b81cbfe6d9241f56e86
x86: olpc build fix
was a fix to a patch that was withdrawn/delayed and then erroneously
commited to x86.git. Revert it.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 75065ff619e42fe35178eda863cbcddd57776794
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Thu May 8 14:06:19 2008 +0200
Revert "relay: fix splice problem"
This reverts commit c3270e577c18b3d0e984c3371493205a4807db9d.
commit e3a2efa67a029453b8098dba179ec2d9d8df612e
Author: Patrik Sevallius <patrik.sevallius at enea.com>
Date: Thu May 8 14:04:08 2008 +0200
[ALSA] soc at91 minor bug fixes
Found these two bugs while browsing through the code. The first one is
a cut-n-paste bug, instead of disabling the clock when request_irq()
fails, it enabled it once more. The second one fixes a debug printout,
AT91_SSC_IER is write only, AT91_SSC_IMR is readable (the printed string
actually says imr).
Frank Mandarino was busy so he asked me to send these to this list.
/Patrik
Signed-off-by: Patrik Sevallius <patrik.sevallius at enea.com>
Acked-by: Frank Mandarino <fmandarino at endrelia.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 30a717f7e951ec0260f31c0637ecf8e6268ba607
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Thu May 8 14:03:30 2008 +0200
[ALSA] soc - at91-pcm - Fix line wrapping
There's more checkpatch stuff to fix in the driver, this just fixes the
minimum required for the following patch to be clean.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ffebabe0bf0de9ee500d4605d6acb71e1ee3b79f
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Thu May 8 10:58:39 2008 +0100
[ARM] lubbock: fix compilation
arch/arm/mach-pxa/lubbock.c:399: error: expected '}' before ';' token
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc
Author: Ben Hutchings <bhutchings at solarflare.com>
Date: Thu May 8 02:53:17 2008 -0700
net: Added ASSERT_RTNL() to dev_open() and dev_close().
dev_open() and dev_close() must be called holding the RTNL, since they
call device functions and netdevice notifiers that are promised the RTNL.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c2ab7ac225e29006b7117d6a9fe8f3be8d98b0c2
Author: Oliver Hartkopp <oliver at hartkopp.net>
Date: Thu May 8 02:49:55 2008 -0700
can: Fix can_send() handling on dev_queue_xmit() failures
The tx packet counting and the local loopback of CAN frames should
only happen in the case that the CAN frame has been enqueued to the
netdevice tx queue successfully.
Thanks to Andre Naujoks <nautsch at gmail.com> for reporting this issue.
Signed-off-by: Oliver Hartkopp <oliver at hartkopp.net>
Signed-off-by: Urs Thuermann <urs at isnogud.escape.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 33f9936b2b73dba6c8685994c441c4fd30b04814
Merge: aca51397d01474f80cab8fc978559b45f2e453ad f227ec3ca2b7be449fb2156e82b40cceed87a34a
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 8 02:35:54 2008 -0700
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit aca51397d01474f80cab8fc978559b45f2e453ad
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu May 8 01:24:25 2008 -0700
netns: Fix arbitrary net_device-s corruptions on net_ns stop.
When a net namespace is destroyed, some devices (those, not killed
on ns stop explicitly) are moved back to init_net.
The problem, is that this net_ns change has one point of failure -
the __dev_alloc_name() may be called if a name collision occurs (and
this is easy to trigger). This allocator performs a likely-to-fail
GFP_ATOMIC allocation to find a suitable number. Other possible
conditions that may cause error (for device being ns local or not
registered) are always false in this case.
So, when this call fails, the device is unregistered. But this is
*not* the right thing to do, since after this the device may be
released (and kfree-ed) improperly. E. g. bridges require more
actions (sysfs update, timer disarming, etc.), some other devices
want to remove their private areas from lists, etc.
I. e. arbitrary use-after-free cases may occur.
The proposed fix is the following: since the only reason for the
dev_change_net_namespace to fail is the name generation, we may
give it a unique fall-back name w/o %d-s in it - the dev<ifindex>
one, since ifindexes are still unique.
So make this change, raise the failure-case printk loglevel to
EMERG and replace the unregister_netdevice call with BUG().
[ Use snprintf() -DaveM ]
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f3261aff35cbc811fee0e23eaea277f1b7286eca
Author: Patrick McHardy <kaber at trash.net>
Date: Thu May 8 01:16:04 2008 -0700
netfilter: Kconfig: default DCCP/SCTP conntrack support to the protocol config values
When conntrack and DCCP/SCTP protocols are enabled, chances are good
that people also want DCCP/SCTP conntrack and NAT support.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ef75d49f116bccbb80bccd423ecf3cb86c4509a5
Author: Patrick McHardy <kaber at trash.net>
Date: Thu May 8 01:15:21 2008 -0700
netfilter: nf_conntrack_sip: restrict RTP expect flushing on error to last request
Some Inovaphone PBXs exhibit very stange behaviour: when dialing for
example "123", the device sends INVITE requests for "1", "12" and
"123" back to back. The first requests will elicit error responses
from the receiver, causing the SIP helper to flush the RTP
expectations even though we might still see a positive response.
Note the sequence number of the last INVITE request that contained a
media description and only flush the expectations when receiving a
negative response for that sequence number.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7312096454b6cd71267eaa3d0efb408e449e9ff3
Author: Patrick McHardy <kaber at trash.net>
Date: Thu May 8 01:13:31 2008 -0700
macvlan: Fix memleak on device removal/crash on module removal
As noticed by Ben Greear, macvlan crashes the kernel when unloading the
module. The reason is that it tries to clean up the macvlan_port pointer
on the macvlan device itself instead of the underlying device. A non-NULL
pointer is taken as indication that the macvlan_handle_frame_hook is
valid, when receiving the next packet on the underlying device it tries
to call the NULL hook and crashes.
Clean up the macvlan_port on the correct device to fix this.
Signed-off-by; Patrick McHardy <kaber at trash.net>
Tested-by: Ben Greear <greearb at candelatech.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c67fa02799bccca3d2e16582493da6d57812ec01
Author: J.H.M. Dassen (Ray) <jdassen at debian.org>
Date: Thu May 8 01:11:04 2008 -0700
net/ipv4: correct RFC 1122 section reference in comment
RFC 1122 does not have a section 3.1.2.2. The requirement to silently
discard datagrams with a bad checksum is in section 3.2.1.2 instead.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10611
Signed-off-by: J.H.M. Dassen (Ray) <jdassen at debian.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 62ab22278308a40bcb7f4079e9719ab8b7fe11b5
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Thu May 8 01:09:11 2008 -0700
tcp FRTO: SACK variant is errorneously used with NewReno
Note: there's actually another bug in FRTO's SACK variant, which
is the causing failure in NewReno case because of the error
that's fixed here. I'll fix the SACK case separately (it's
a separate bug really, though related, but in order to fix that
I need to audit tp->snd_nxt usage a bit).
There were two places where SACK variant of FRTO is getting
incorrectly used even if SACK wasn't negotiated by the TCP flow.
This leads to incorrect setting of frto_highmark with NewReno
if a previous recovery was interrupted by another RTO.
An eventual fallback to conventional recovery then incorrectly
considers one or couple of segments as forward transmissions
though they weren't, which then are not LOST marked during
fallback making them "non-retransmittable" until the next RTO.
In a bad case, those segments are really lost and are the only
one left in the window. Thus TCP needs another RTO to continue.
The next FRTO, however, could again repeat the same events
making the progress of the TCP flow extremely slow.
In order for these events to occur at all, FRTO must occur
again in FRTOs step 3 while the key segments must be lost as
well, which is not too likely in practice. It seems to most
frequently with some small devices such as network printers
that *seem* to accept TCP segments only in-order. In cases
were key segments weren't lost, things get automatically
resolved because those wrongly marked segments don't need to be
retransmitted in order to continue.
I found a reproducer after digging up relevant reports (few
reports in total, none at netdev or lkml I know of), some
cases seemed to indicate middlebox issues which seems now
to be a false assumption some people had made. Bugzilla
#10063 _might_ be related. Damon L. Chesser <damon at damtek.com>
had a reproducable case and was kind enough to tcpdump it
for me. With the tcpdump log it was quite trivial to figure
out.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 02539d71fa98d5737bb668b02286c76241e4bac9
Author: Christoph Hellwig <hch at lst.de>
Date: Thu May 8 15:29:12 2008 +1000
[POWERPC] spufs: lockdep annotations for spufs_dir_close
We need to acquire the parent i_mutex with I_MUTEX_PARENT to keep
lockdep happy.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 7a28a1549f9514f3b0dd3dde5c7337ba5d44fba3
Author: Christoph Hellwig <hch at lst.de>
Date: Thu May 8 15:26:32 2008 +1000
[POWERPC] spufs: don't requeue victim contex in find_victim if it's not in spu_run
We should not requeue the victim context in find_victim if the owner is
not in spu_run. It's first not needed because leaving the context on
the spu is an optimization and second is harmful because it means the
owner could re-enter spu_run when the context is on the runqueue and
trip the BUG_ON in __spu_update_sched_info.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 1e0f50ae11ab5838009994a3266accc1319c90d9
Author: Paul Mundt <lethal at linux-sh.org>
Date: Thu May 8 13:40:17 2008 +0900
sh: Stub in cpu_to_node() and friends for NUMA build.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 4370fe1c06ffa251b63b12a41e2599037a4b7f87
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu Apr 24 21:53:07 2008 +0900
sh: intc register modify fix
Make sure register modifications stay atomic. Fixes processors with
shared priority register masking. Dual bitmap masking is unaffected.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 720be99006c5830970d5b62633c92b29e4cef137
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu Apr 24 21:47:15 2008 +0900
sh: no high level trigger on some sh3 cpus
The processor models sh7706, sh7707 and sh7709 don't support high
level trigger sense configuration. And the intc code looks like
crap these days so what's the difference.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 995d538a5b09e3c129d8aac559f07a0f5cc3fc3c
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu Apr 24 21:41:12 2008 +0900
sh: clean up sh7710 and sh7720 intc tables
Clean up the intc tables by removing unneeded #ifdefs. The vector
list is what selects which interrupt sources that should be added,
having unsupported bitfields listed is ok as long as the vector
is excluded from the list.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit d58876e289b0153bf86162aa1a43249e0f0aa03d
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu Apr 24 21:36:34 2008 +0900
sh: add interrupt ack code to sh3
This patch adds interrupt acknowledge code for external interrupt
sources on sh3 processors. Only really required for edge triggered
interrupts, but we ack regardless of sense configuration.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit a276e588a92737889c21e736f2bbed8aecda25fb
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu Apr 24 21:30:09 2008 +0900
sh: unify external irq pin code for sh3
This patch unifies the sh3 external irq pin code. It buys us some
savings with reduced code redundancy, but the main feature with
this change is irq sense selection support for all sh3 processors.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 3d2c2f3ef7c5425d23424326a2345c385bb2d415
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 21:37:39 2008 +0900
sh-sci: avoid writing to nonexistent registers
Only write to hardware in SCI_OUT() if the register size is valid.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9b4e466f93c6b614d05139d84a930a55fe4cd781
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 21:31:14 2008 +0900
sh-sci: sh7722 lacks scsptr registers
The sh7722 serial ports all lack SCSPTR registers, so mark them as
nonexistent in the register table.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 346b746300f470bb4a72b66275d6a43987c5dfa6
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 21:25:29 2008 +0900
sh-sci: improve sh7722 support
Improve sh7722 support for SCIF1 and SCIF2 and separate code
from sh7366 implementation.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 191d4437b9c028afee1a0568d9c7e6e0b264c703
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 21:16:06 2008 +0900
sh: reset hardware from early printk
Reset the transmitter and receiver when setting up early printk.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 4a65e3827bcff072e5f4a96b3f73f9f17eb7d6d8
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 21:05:11 2008 +0900
sh: drain and wait for early printk
Drain by waiting for all characters to be sent, and make sure to
wait a little bit after setting up the baud rate.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 0fba32136579648a5782a41e93d4a79547456a89
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 21:00:54 2008 +0900
sh: use sci_out() for early printk
Use sci_out() instead of ctrl_outw() for early printk setup code.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 0146ba78b9339c27ed12545f9bdc208604354bb3
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 20:56:44 2008 +0900
sh: add memory resources to /proc/iomem
Add physical memory resources such as System RAM, Kernel code/data/bss
and reserved crash dump area to /proc/iomem. Same strategy as on x86.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 3d83984e99d80672b1d2e3c7dfdd393631883428
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 20:50:27 2008 +0900
sh: add kernel bss resource
Do like everyone else and have a struct resource for kernel bss.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 65c07d4b3d919ec4a9a95cf576b0685bd382cdf3
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 20:24:52 2008 +0900
sh: fix sh7705 interrupt vector typo
Fix sh7705 interrupt sources for vectors 0xc80 and 0xca0.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 57b84f2b674228e61d7e7b05493aa819244a7b56
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 20:18:04 2008 +0900
sh: update smc91x platform data for se7722
Select smc91x bus width using platform data for se7722 now when the
smc91x header file is in place.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 8a3ee0fc8fe3a7ad89997619ceed555288cf8366
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Wed Apr 23 20:13:59 2008 +0900
sh: update smc91x platform data for MigoR
Select smc91x bus width and irg flags using platform data for MigoR
now when the smc91x header file is in place.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 8cd9612e9b56222cf8d851153df7060de2b36273
Author: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Date: Fri Apr 25 18:01:17 2008 +0900
sh: remove -traditional.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
CC: Sam Ravnborg <sam at ravnborg.org>
CC: linux-sh at vger.kernel.org
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 0305794c7a86f1b25281fb9109b76fc4578f6038
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 17:58:42 2008 +0900
rtc: rtc-sh: Fixup for 64-bit resources.
ioremap() and friends get the size information right, so force everything
to go through there.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit ae8a5348acaefc5cb1f60199ded30900d445c986
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 17:58:21 2008 +0900
sh: r7780rp: Kill off unneded ifdefs for irq setup.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit e305ec80eae8c1ea117d4a39e58181643d382a52
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 16:10:53 2008 +0900
sh: rts7751r2d: Kill off unneeded ifdefs.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit a1dc4b59fa4af97ae68ee214d4d72bbd7c7ec1dc
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 16:08:37 2008 +0900
sh: intc_sh5 depends on cayman board for IRQ priority table.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 105eabfd5164dac5c3c825ae6bc050c1ad45ca51
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 16:07:53 2008 +0900
input: i8042: sh64 IRQ definitions depend on cayman board.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 85f094ecb1c52b9ec9a88c9d2c8beaba72b4f21f
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 16:04:20 2008 +0900
sh: Enable use of the clk fwk on SH-5.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 5e2c2872bd481ee20758d7cf4860f4ad1cefff98
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 16:03:21 2008 +0900
sh64: export onchip_remap/unmap() too.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 971ac16d56301c7150771409607846f9facc2f13
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 16:01:38 2008 +0900
sh64: Some symbol exports to make the allmodconfig happier.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit e35e283fa065f4c420d9469b2d87ec2e0180b784
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 14:27:08 2008 +0900
mtd: solutionengine flash map depends on solution engine mach group.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit f5f826c685464301e4316a9321eb95801c653158
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Mar 31 01:40:17 2008 +0300
sh: remove the broken SH_MPC1211 support
SH_MPC1211 has been marked as BROKEN for some time.
Unless someone is working on reviving it now, I'd therefore suggest this
patch to remove it.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 2a6b8148c050941dd61779cb0b49c5c3ea854ebf
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 13:05:17 2008 +0900
sh64: Setup I/D-TLB defaults in SH-5 probe path.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 640f7487a919dec4ea98b88a050331f6a4044ea9
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 13:04:56 2008 +0900
sh: kexec and kdump depend on SUPERH32.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 824fcdded0591b879dc0d5c1873c168ca4bf6fae
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 12:59:09 2008 +0900
sh64: Fix up compile warning in event tracer.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit ccd805874198c248498b5f269656ec14397eeede
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 12:58:40 2008 +0900
sh64: Fixup the nommu build.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9141d30a480850d989fc245909b98670a7b66ec1
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 11:54:24 2008 +0900
sh64: fixups for xtime_lock seqlock conversion.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 1a013e2ffc1154ce8ee7076385d83c574066d83c
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Apr 25 11:54:06 2008 +0900
sh: sh-bios depends on SUPERH32.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit dc5dc7e6d71ca9fd1ea01a1418150af3b2937489
Author: David S. Miller <davem at davemloft.net>
Date: Wed May 7 18:54:05 2008 -0700
sparc: Fix SA_ONSTACK signal handling.
We need to be more liberal about the alignment of the buffer given to
us by sigaltstack(). The user should not need to be mindful of all of
the alignment constraints we have for the stack frame.
This mirrors how we handle this situation in clone() as well.
Also, we align the stack even in non-SA_ONSTACK cases so that signals
due to bad stack alignment can be delivered properly. This makes such
errors easier to debug and recover from.
Finally, add the sanity check x86 has to make sure we won't overflow
the signal stack.
This fixes glibc testcases nptl/tst-cancel20.c and
nptl/tst-cancelx20.c
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3de2403e6659d71b36ec820dc9b942762ddfe6eb
Merge: e0164af66b6ec165836d1d862b3f800890713452 1e38c126c9252b612697e34f43b1b3371c8ee31d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed May 7 17:04:49 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Fix fork/clone/vfork system call restart.
sparc: Fix mmap VA span checking.
commit 1e38c126c9252b612697e34f43b1b3371c8ee31d
Author: David S. Miller <davem at davemloft.net>
Date: Wed May 7 16:21:28 2008 -0700
sparc: Fix fork/clone/vfork system call restart.
We clobber %i1 as well as %i0 for these system calls,
because they give two return values.
Therefore, on error, we have to restore %i1 properly
or else the restart explodes since it uses the wrong
arguments.
This fixes glibc's nptl/tst-eintr1.c testcase.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e0164af66b6ec165836d1d862b3f800890713452
Author: Auke Kok <auke-jan.h.kok at intel.com>
Date: Wed May 7 13:42:33 2008 -0700
[MAINTAINERS] New maintainer for Intel ethernet adapters
I'm handing over maintainership to Jeff Kirsher and moving on
to other Linux/Open Source work within Intel. Good luck to Jeff ;)
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d9cadb0d2ffed847851945a66e80d0b9d767611c
Merge: 592eb9997dc89cd0c8f89a505e5348bbddce70f6 21f20b69a567ca8971fe643d2ebe5d680c9b43af
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Wed May 7 21:54:02 2008 +0100
Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux-2.6.git
commit 592eb9997dc89cd0c8f89a505e5348bbddce70f6
Author: Robert Jarzmik <rjarzmik at free.fr>
Date: Wed May 7 20:39:06 2008 +0100
[ARM] 5032/1: Added cpufreq support for pxa27x CPU
PXA cpus maximum frequency depends on the cpu (624 for
pxa270, 520 for pxa272, 416 for pxa271). It should be
provided on kernel or module start (cpu-pxa
pxa27x_maxfreq parameter).
Make use of cpufreq_frequency_table_cpuinfo (patch by Bill
Reese provided by Philipp Zabel).
Some additionnal fixes from Philipp Zabel include :
* rename PXA cpufreq driver to reflect added PXA27x support
* remove unused variable ramstart from PXA cpufreq driver
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Robert Jarzmik <rjarzmik at free.fr>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 3679389b880a318f9b9cfebab5714443796f2f71
Author: Robert Jarzmik <rjarzmik at free.fr>
Date: Wed May 7 20:36:34 2008 +0100
[ARM] 5031/1: Indentation correction in cpu-pxa.c.
These indentation corrections prepare the pxa27x support.
Signed-off-by: Robert Jarzmik <rjarzmik at free.fr>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ebdf982aaeb0005d5093b10872adce17ea12f5ba
Author: Guennadi Liakhovetski <lg at denx.de>
Date: Mon May 5 15:31:44 2008 +0100
[ARM] 5028/1: pxafb: fix broken "backward compatibility way" in framebuffer
configuration
Commit 84f43c308b73a6a12128288721a1007ba4f1a8da "pxafb: introduce register
independent LCD connection type for pxafb" implements compatibility mode
for old style pxafb_mach_info initialization data wrongly, causing the
system to Oops repeatedly - first during probe, then when drawing. Fix it
and make pxafb_decode_mach_info void.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Acked-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit bdd0f5f06e7647b545bec3ead2fa2a5fcdf0f0f9
Author: Davide Rizzo <davide at elpa.it>
Date: Sat May 3 07:53:14 2008 +0100
[ARM] 4882/2: Correction for S3C2410 clkout generation
This is a correction for 2 small bugs for the Samsung S3C2410 ARM9 SoC
clocks generator
Signed-off-by: Davide Rizzo <davide at elpa.it>
Acked-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 12137c593d127c6c1a3eb050674da047682badaf
Author: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed May 7 11:35:06 2008 -0700
IB/ehca: Wait for async events to finish before destroying QP
This is necessary because, in a multicore environment, a race between
uverbs async handler and destroy QP could occur.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit ab69b3cf1219e0d07bb4ea373f36b1de38af531c
Author: John Gregor <john.gregor at qlogic.com>
Date: Wed May 7 11:01:10 2008 -0700
IB/ipath: Fix SDMA error recovery in absence of link status change
What's fixed:
in ipath_cancel_sends()
We need to unconditionally set ABORTING. So, swap the tests
so the set_bit() isn't shadowed by the &&.
If we've disarmed the piobufs, then we need to unconditionally
set DISARMED. So, move it out from the overly protective if
at the bottom.
in sdma_abort_task()
Abort_task was written knowing that the SDMA engine would always
be reset (and restarted) on error. A recent change broke that
fundamental assumption by taking the restart portion and making
it conditional on a link status change. But, SDMA can go boom
without a link status change in some conditions.
Signed-off-by: John Gregor <john.gregor at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit e2ab41cae418108f376ad1634d7507f56379f7a2
Author: Dave Olson <dave.olson at qlogic.com>
Date: Wed May 7 11:00:15 2008 -0700
IB/ipath: Need to always request and handle PIO avail interrupts
Now that we always use PIO for vl15 on 7220, we could get stuck forever
if we happened to run out of PIO buffers from the verbs code, because
the setup code wouldn't run; the interrupt was also ignored if SDMA was
supported. We also have to reduce the pio update threshold if we have
fewer kernel buffers than the existing threshold.
Clean up the initialization a bit to get ordering safer and more
sensible, and use the existing ipath_chg_kernavail call to do init,
rather than doing it separately.
Drop unnecessary clearing of pio buffer on pio parity error.
Drop incorrect updating of pioavailshadow when exitting freeze mode
(software state may not match chip state if buffer has been allocated
and not yet written).
If we couldn't get a kernel buffer for a while, make sure we are
in sync with hardware, mainly to handle the exitting freeze case.
Signed-off-by: Dave Olson <dave.olson at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 2889d1ef1240591fa4c72a6753e0a8d1c6e18140
Author: Michael Albaugh <Michael.Albaugh at Qlogic.com>
Date: Wed May 7 10:59:23 2008 -0700
IB/ipath: Fix count of packets received by kernel
The loop in ipath_kreceive() that processes packets increments the
loop-index 'i' once too often, because the exit condition does not
depend on it, and is checked after the increment. By adding a check for
!last to the iterator in the for loop, we correct that in a way that is
not so likely to be re-broken by changes in the loop body.
Signed-off-by: Michael Albaugh <micheal.albaugh at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 2bfc8e9edf200aeeca18ee44bcbf6bce65438a42
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date: Wed May 7 10:58:50 2008 -0700
IB/ipath: Return the correct opcode for RDMA WRITE with immediate
This patch fixes a bug in the RC responder which generates a completion
entry with the wrong opcode when an RDMA WRITE with immediate is received.
Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit b4d390d8d219452e5d4257c87134a6934d7fabeb
Author: Dave Olson <dave.olson at qlogic.com>
Date: Wed May 7 10:57:48 2008 -0700
IB/ipath: Fix bug that can leave sends disabled after freeze recovery
The semantics of cancel_sends changed, but the code using it was missed.
Don't leave sends and pioavail updates disabled, and add a comment as to
why the force update is needed.
Signed-off-by: Dave Olson <dave.olson at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 6e87d1500713767866db0668bbcec75719576f3c
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date: Wed May 7 10:57:14 2008 -0700
IB/ipath: Only increment SSN if WQE is put on send queue
If a send work request has immediate errors and is not put on the
send queue, we shouldn't update any of the QP state.
The increment of the SSN wasn't obeying this.
Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 5f51efc195dfb860c60fafb4e47fe4b7cad2626d
Author: Michael Albaugh <Michael.Albaugh at Qlogic.com>
Date: Wed May 7 10:56:47 2008 -0700
IB/ipath: Only warn about prototype chip during init
We warn about prototype chips, but the function that checks for
support is also called as a result of a get_portinfo request, which
can clutter the logs.
Restrict warning to only appear during initialization.
Signed-off-by: Michael Albaugh <michael.albaugh at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit ffee0259c9edcc4c0f06b60df51c461eeecad4c0
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Apr 30 09:08:54 2008 +0200
docbook: fix bio missing parameter
Fix fs/bio.c kernel-doc parameter warning:
Warning(linux-2.6.25-git14//fs/bio.c:972): No description found for parameter 'reading'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 67412f0e78dfbbbcb36e631d9df70c6c559d60d4
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Tue May 6 20:46:49 2008 +0800
[CRYPTO] hmac: Avoid calling virt_to_page on key
When HMAC gets a key longer than the block size of the hash, it needs
to feed it as input to the hash to reduce it to a fixed length. As
it is HMAC converts the key to a scatter and gather list. However,
this doesn't work on certain platforms if the key is not allocated
via kmalloc. For example, the keys from tcrypt are stored in the
rodata section and this causes it to fail with HMAC on x86-64.
This patch fixes this by copying the key to memory obtained via
kmalloc before hashing it.
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit eeae1d48c011839d9e1cdc1e8aacf0193c9d8197
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 13:26:27 2008 +0200
block: use unitialized_var() in bio_alloc_bioset()
Better than setting idx to some random value and it silences the
same bogus gcc warning.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit e5e1d3cb20034a3cbcfff1f0bae12201aa2ce17e
Author: Stas Sergeev <stsp at aknet.ru>
Date: Wed May 7 12:39:56 2008 +0200
pcspkr: fix dependancies
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Acked-by: Thomas Gleixner <tglx at linutronix.de>
Acked-by: Dmitry Torokhov <dtor at mail.ru>
CC: Vojtech Pavlik <vojtech at suse.cz>
CC: Michael Opdenacker <michael-lists at free-electrons.com>
[fixed for 2.6.26-rc1 by tiwai]
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5816339310b2d9623cf413d33e538b45e815da5d
Author: David S. Miller <davem at davemloft.net>
Date: Wed May 7 02:24:28 2008 -0700
sparc: Fix mmap VA span checking.
We should not conditionalize VA range checks on MAP_FIXED.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 28f13702f03e527fcb979747a882cf366c489c50
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 10:15:46 2008 +0200
block: avoid duplicate calls to get_part() in disk stat code
get_part() is fairly expensive, as it O(N) loops over partitions
to find the right one. In lots of normal IO paths we end up looking
up the partition twice, to make matters even worse. Change the
stat add code to accept a passed in partition instead.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 6d63c275572d1e6f00d4fa154f16fbb0d8c2d2bf
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 09:51:23 2008 +0200
cfq-iosched: make io priorities inherit CPU scheduling class as well as nice
We currently set all processes to the best-effort scheduling class,
regardless of what CPU scheduling class they belong to. Improve that
so that we correctly track idle and rt scheduling classes as well.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 9afadc4b1fd25337003832c9a4668f9bd42cdda9
Author: Jan Kara <jack at ghost.suse.cz>
Date: Tue May 6 18:26:17 2008 +0200
udf: Fix memory corruption when fs mounted with noadinicb option
When UDF filesystem is mounted with noadinicb mount option, it
happens that we extend an empty directory with a block. A code in
udf_add_entry() didn't count with this possibility and used
uninitialized data leading to memory and filesystem corruption.
Add a check whether file already has some extents before operating
on them.
Signed-off-by: Jan Kara <jack at suse.cz>
commit 221e583a735fc5d879d83c2a76b8ee5afcbdf146
Author: Rasmus Rohde <rohde at duff.dk>
Date: Wed Apr 30 17:22:06 2008 +0200
udf: Make udf exportable
Cc: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Rasmus Rohde <rohde at duff.dk>
Signed-off-by: Jan Kara <jack at suse.cz>
commit dbaf2c003e151ad9231778819b0977f95e20e06f
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 09:48:17 2008 +0200
block: optimize generic_unplug_device()
Original patch from Mikulas Patocka <mpatocka at redhat.com>
Mike Anderson was doing an OLTP benchmark on a computer with 48 physical
disks mapped to one logical device via device mapper.
He found that there was a slowdown on request_queue->lock in function
generic_unplug_device. The slowdown is caused by the fact that when some
code calls unplug on the device mapper, device mapper calls unplug on all
physical disks. These unplug calls take the lock, find that the queue is
already unplugged, release the lock and exit.
With the below patch, performance of the benchmark was increased by 18%
(the whole OLTP application, not just block layer microbenchmarks).
So I'm submitting this patch for upstream. I think the patch is correct,
because when more threads call simultaneously plug and unplug, it is
unspecified, if the queue is or isn't plugged (so the patch can't make
this worse). And the caller that plugged the queue should unplug it
anyway. (if it doesn't, there's 3ms timeout).
Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 2cdf79cafbd11580f5b63cd4993b45c1c4952415
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 09:33:55 2008 +0200
block: get rid of likely/unlikely predictions in merge logic
They tend to depend a lot on the workload, so not a clear-cut
likely or unlikely fit.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 7f3d4ee108c184ab215036051087aaaaa8de7661
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed May 7 09:22:39 2008 +0200
vfs: splice remove_suid() cleanup
generic_file_splice_write() duplicates remove_suid() just because it
doesn't hold i_mutex. But it grabs i_mutex inside splice_from_pipe()
anyway, so this is rather pointless.
Move locking to generic_file_splice_write() and call remove_suid() and
__splice_from_pipe() instead.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 07416d29bcf608257f1e5280642dcbe0021518a3
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 09:17:12 2008 +0200
cfq-iosched: fix RCU race in the cfq io_context destructor handling
put_io_context() drops the RCU read lock before calling into cfq_dtor(),
however we need to hold off freeing there before grabbing and
dereferencing the first object on the list.
So extend the rcu_read_lock() scope to cover the calling of cfq_dtor(),
and optimize cfq_free_io_context() to use a new variant for
call_for_each_cic() that assumes the RCU read lock is already held.
Hit in the wild by Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit aa94b5371f6f898558d9fa5690cc6e4bf917a572
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 09:27:43 2008 +0200
block: adjust tagging function queue bit locking
For most initialization purposes, calling blk_queue_init_tags() without
the queue lock held is OK. Only if called for resizing an existing map
must the lock be held. Ditto for tag cleanup, the maps are reference
counted.
So switch the general queue flag setting to the unlocked variant, but
retain the locked variant for resizing.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 45e576b1c3d0020607b8666c0247164e92c7d719
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Wed May 7 09:22:59 2008 +0200
[S390] guest page hinting light
Use the existing arch_alloc_page/arch_free_page callbacks to do
the guest page state transitions between stable and unused.
Acked-by: Rik van Riel <riel at redhat.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 74c76c84576eb2d806f40f6cb2fc8302c01869d8
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed May 7 09:22:58 2008 +0200
[S390] tty3270: fix put_char fail/success conversion.
The wrong function got coverted ;)
CC drivers/s390/char/tty3270.o
drivers/s390/char/tty3270.c:1747:
warning: initialization from incompatible pointer type
Acked-by: Alan Cox <alan at redhat.com>
Cc: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit b499d76bfd78e900039155247e1c21bfdf807b7b
Author: Roland McGrath <roland at redhat.com>
Date: Wed May 7 09:22:57 2008 +0200
[S390] compat ptrace cleanup
This removes redundant arch code for generic ptrace requests
already handled by ptrace_request and compat_ptrace_request.
It simplifies things to just have the standard entry points,
and use the generic compat_sys_ptrace.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit c6ca1850e78d60c299ceb4c240a04af9e2384f70
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Wed May 7 09:22:56 2008 +0200
[S390] s390mach compile warning
Fix the following compile warning:
drivers/s390/s390mach.c: In function 's390_collect_crw_info':
drivers/s390/s390mach.c:77: warning: ignoring return value of 'down_interruptibl
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 5b8909871b80a6cc2bd21aa5262c1424e3d26339
Author: Michael Ernst <mernst at de.ibm.com>
Date: Wed May 7 09:22:55 2008 +0200
[S390] cio: Fix parsing mechanism for blacklisted devices.
New format cssid.ssid.devno is now parsed correctly.
Signed-off-by: Michael Ernst <mernst at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 139b83dd57248a3c8fcfb256e562311ad61478e9
Author: Michael Ernst <mernst at de.ibm.com>
Date: Wed May 7 09:22:54 2008 +0200
[S390] cio: Remove cio_msg kernel parameter.
The only sporadically used CIO_DEBUG messages are replaced by ordinary
CIO_MSG_EVENT messages. The CIO_MSG_EVENT messages debug levels are
consolidated.
Signed-off-by: Michael Ernst <mernst at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 0eaeafa10f3b2bd027e95859a6785d4c7fcc174c
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Wed May 7 09:22:53 2008 +0200
[S390] s390-kvm: leave sie context on work. Removes preemption requirement
From: Martin Schwidefsky <schwidefsky at de.ibm.com>
This patch fixes a bug with cpu bound guest on kvm-s390. Sometimes it
was impossible to deliver a signal to a spinning guest. We used
preemption as a circumvention. The preemption notifiers called
vcpu_load, which checked for pending signals and triggered a host
intercept. But even with preemption, a sigkill was not delivered
immediately.
This patch changes the low level host interrupt handler to check for the
SIE instruction, if TIF_WORK is set. In that case we change the
instruction pointer of the return PSW to rerun the vcpu_run loop. The kvm
code sees an intercept reason 0 if that happens. This patch adds accounting
for these types of intercept as well.
The advantages:
- works with and without preemption
- signals are delivered immediately
- much better host latencies without preemption
Acked-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 2688905e6a9b3647bf7b452cb0ff2bdb166bd8fe
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Wed May 7 09:22:52 2008 +0200
[S390] s390: Optimize user and work TIF check
On return from syscall or interrupt, we have to check if we return to
userspace (likely) and if there is work todo (less likely) to decide
if we handle the work. We can optimize this check: we first check for
the less likely work case and then check for userspace.
This patch is also a preparation for an additional patch, that fixes a bug
in KVM dealing with cpu bound guests.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit bf0f97025c7306870b86ccd63669aa278e7ec1c2
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 7 09:09:39 2008 +0200
block: sysfs store function needs to grab queue_lock and use queue_flag_*()
Concurrency isn't a big deal here since we have requests in flight
at this point, but do the locked variant to set a better example.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 45828b812ddb608ddf83eff11601f62b726d13ab
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed May 7 11:41:26 2008 +0800
Blackfin Serial Driver: abstract away DLAB differences into header
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 89bf6dc51ac7adb5a7d443648d9eb76909a1df8e
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed May 7 11:41:26 2008 +0800
Blackfin Serial Driver: macro away the IER differences between processors
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 56f87713022a6bdf00b0a50d086fdaddb54e8e5c
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Sat May 10 00:11:59 2008 +0800
[Blackfin] arch: remove useless IRQ_SW_INT defines
IRQ_SW_INT1 and IRQ_SW_INT2 obsolete:
Remove useless defines
Fix SYS_IRQS
Keep numbering scheme, so we don't break existing configurations.
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit e4f7c0bf1f2e8a1b184a33ab60e874391d70f86c
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Sat May 10 00:08:12 2008 +0800
[Blackfin] arch: protect linux/usb/musb.h include until the driver gets mainlined
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit b964c592d42a7146a0b157147432da882abd3404
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Sat May 10 00:06:10 2008 +0800
[Blackfin] arch: protect linux/usb/isp1362.h include until the driver gets mainlined
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 197fba56864082951ec52ae7d75b8177e44e471e
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Wed May 7 17:03:27 2008 +0800
[Blackfin] arch: add EBIU supporting for BF54x EZKIT SMSC LAN911x/LAN921x families embedded ethernet driver
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit d7323696a910e1c00dc055ecc8c52dfedd9bbb59
Author: Grace Pan <grace.pan at analog.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Set spi flash partition on bf527 as like bf548.
Signed-off-by: Grace Pan <grace.pan at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 96a87e2f158084f237dc7f871cee0ce8b55744f1
Author: Meihui Fan <mhfan at hhcn.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: fix bug - Remove module will not free L1 memory used
Remove module will not free L1 memory used which caused by
memory access after free. This patch fixes it.
Signed-off-by: Meihui Fan <mhfan at hhcn.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 60c05953c1908626d1d8aa6e6f24bac8b1c65602
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: fix wrong header name in comment
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit b9c9e788942308cf295074a68d2081f20e554eb2
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Fix BUG - spi flash on bf527 ezkit would fail at mount
BF527-EZKit features 16MBit M25P16 flash
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 72268689cf28091ba202d7c5f4e7c5d613edd4ac
Author: Bryan Wu <cooloney at kernel.org>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: add twi_lcd and twi_keypad i2c board info to bf527-ezkit
- JP3 should be installed for STAMP enable
- IRQ for twi_keypad driver is IRQ_PF8
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit d7e5dd41e394397aefd25ea412aeb47cf1b54d80
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Add physmap partition for BF527-EZkit
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 0893f1250f87e0a832f47bb60fb69ed0d52be7a3
Author: Bernd Schmidt <bernds_cb1 at t-online.de>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: fix gdb testing regression
When transferring to IRQ5 from an exception, save SYSCFG in memory across the
transfer and clear the trace bit.
When we get a single step exception, check whether we can safely clear the
trace bit in SYSCFG. We can (and should) clear it after the first instruction
of the interrupt handler; the first insn saves SYSCFG to the stack in all
handlers.
Signed-off-by: Bernd Schmidt <bernds_cb1 at t-online.de>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 8513c42edb3f1c91a8418fae11846c87cf7b8581
Author: Bernd Schmidt <bernds_cb1 at t-online.de>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: disable single stepping when delivering a signal
When delivering a signal, disable single stepping but call
ptrace_notify if it was enabled before. The idea was taken
from the x86 port.
Signed-off-by: Bernd Schmidt <bernds_cb1 at t-online.de>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 7d39270d31b91647722823a0919164dea9fd4ad7
Author: Bernd Schmidt <bernds_cb1 at t-online.de>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Delete unused (copied from m68k) entries in asm-offsets.c.
Fix some really ancient code that was correct only for the m68k port.
Delete unused (i.e. copied from m68k) entries in asm-offsets.c.
Signed-off-by: Bernd Schmidt <bernds_cb1 at t-online.de>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit ddb3f00ca0897f585128a6cca229eeb9d91fa6ef
Author: Bernd Schmidt <bernds_cb1 at t-online.de>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: In the double fault handler, set up the PT_RETI slot
In the double fault handler, set up the PT_RETI slot so that
we print out the correct return address in the dumping code.
Signed-off-by: Bernd Schmidt <bernds_cb1 at t-online.de>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 1bfb4b21c7c39295f5535c139f796df1d51ec009
Author: Vitja Makarov <vitja.makarov at gmail.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Support for CPU_FREQ and NOHZ
Singed-off-by: Vitja Makarov <vitja.makarov at gmail.com>
commit 14b03204c8060d036b04cbb18bbd6f6f311f4fed
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Functional power management support: Add CPU and platform voltage scaling support
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 19d6d7d53c8ff809182a1f092d2c6918146414e9
Author: Bernd Schmidt <bernds_cb1 at t-online.de>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: fix bug - breaking the atomic sections code.
The following cleanup patch:
add __user markings to a few userspace system functions
mysteriously added a "&" operator that doesn't belong in there, breaking the
atomic sections code.
Signed-off-by: Bernd Schmidt <bernds_cb1 at t-online.de>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit c2f9527979c14a21bbaa31c12a14204aabeb6e45
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Equalize include files: Add VR_CTL masks
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 67dea022d84f7c2b1e4d8c74a16fb07bf1a7d8f0
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Wed May 7 11:41:26 2008 +0800
[Blackfin] arch: Cleanup Kconfig, fix comment and make sure we exclude CCLK=SCLK for some configurations
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit bd1d23a81083f03ac63afbb7656b87eed04d8953
Merge: c0a18111e571138747a98af18b3a2124df56a0d1 d45100f7b69e3d9cd0cd5e956b6ac2c78d460d07
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 18:18:43 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix initrd regression.
usb: Sparc build fix, make USB_ISP1760_OF depend on PPC_OF
sparc64: remove online_page()
sparc64: use compat_sys_utimes instead of home-grown local copy.
sbus: Fix bpp driver build.
sparc video: make blank use proper constant
Revert "[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit()."
sparc: tcx.c remove unnecessary function
commit c0a18111e571138747a98af18b3a2124df56a0d1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 17:09:27 2008 -0700
Revert "uml: fix gcc problem"
This reverts commit 22eecde2f9034764a3fd095eecfa3adfb8ec9a98. Uli
reports that it breaks UML on x86-64 with the Fedora 8 gcc (gcc 4.1.2),
causing a crash on startup. See
http://marc.info/?l=linux-kernel&m=121011722806093&w=2
for a trace.
Reported-by: Ulrich Drepper <drepper at redhat.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 273748cc908a901d082b4da5a16b2541c9d78a02
Author: Roland Dreier <rolandd at cisco.com>
Date: Tue May 6 15:56:22 2008 -0700
RDMA/cxgb3: Fix severe limit on userspace memory registration size
Currently, iw_cxgb3 is severely limited on the amount of userspace
memory that can be registered in in a single memory region, which
causes big problems for applications that expect to be able to
register 100s of MB.
The problem is that the driver uses a single kmalloc()ed buffer to
hold the physical buffer list (PBL) for the entire memory region
during registration, which means that 8 bytes of contiguous memory are
required for each page of memory being registered. For example, a 64
MB registration will require 128 KB of contiguous memory with 4 KB
pages, and it unlikely that such an allocation will succeed on a busy
system.
This is purely a driver problem: the temporary page list buffer is not
needed by the hardware, so we can fix this by writing the PBL to the
hardware in page-sized chunks rather than all at once. We do this by
splitting the memory registration operation up into several steps:
- Allocate PBL space in adapter memory for the full registration
- Copy PBL to adapter memory in chunks
- Allocate STag and enable memory region
This also allows several other cleanups to the __cxio_tpt_op()
interface and related parts of the driver.
This change leaves the reregister memory region and memory window
operations broken, but they already didn't work due to other
longstanding bugs, so fixing them will be left to a later patch.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit cf432eb50ffd03572c08a006f44e0069957cf300
Author: Steve French <sfrench at us.ibm.com>
Date: Tue May 6 22:27:16 2008 +0000
[CIFS] cleanup cifsd completion
Was a holdover from the old kernel_thread based cifsd
code. We needed to know that the thread had set the task variable
before proceeding. Now that kthread_run returns the new task, this
doesn't appear to be needed anymore.
As best I can tell, this sleep was intended to try to prevent
cifs_umount from freeing the cifsSesInfo struct before cifsd had
exited. Now that cifsd is using the kthread API, we know that
when kthread_stop returns that cifsd has exited, so I don't
think this is needed any longer.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Acked-by: Christop Hellwig <hch at infradead.org>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit d45100f7b69e3d9cd0cd5e956b6ac2c78d460d07
Author: David S. Miller <davem at davemloft.net>
Date: Tue May 6 15:19:54 2008 -0700
sparc64: Fix initrd regression.
We die because we forget to convert initrd_start and
initrd_end to virtual addresses.
Reported by Mikael Pettersson
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3eb6753e20af1803d7784efc36e8208e8d5fac05
Author: David S. Miller <davem at davemloft.net>
Date: Tue May 6 15:15:12 2008 -0700
usb: Sparc build fix, make USB_ISP1760_OF depend on PPC_OF
Sparc doesn't have some of the OF interfaces this driver
wants to use.
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit dea570e08a69b14808b2cab56d6b0dda72145fa6
Author: Steve French <sfrench at us.ibm.com>
Date: Tue May 6 22:05:51 2008 +0000
[CIFS] Remove over-indented code in find_unc().
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 0e9913362a967377eb886bbdf305ec58aa07a878
Author: Roland Dreier <rolandd at cisco.com>
Date: Tue May 6 15:03:38 2008 -0700
RDMA/cxgb3: Don't add PBL memory to gen_pool in chunks
Current iw_cxgb3 code adds PBL memory to the driver's gen_pool in 2 MB
chunks. This limits the largest single allocation that can be done to
the same size, which means that with 4 KB pages, each of which takes 8
bytes of PBL memory, the largest memory region that can be allocated
is 1 GB (256K PBL entries * 4 KB/entry).
Remove this limit by adding all the PBL memory in a single gen_pool
chunk, if possible. Add code that falls back to smaller chunks if
gen_pool_add() fails, which can happen if there is not sufficient
contiguous lowmem for the internal gen_pool bitmap.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit db176c6ed8974fae94328ad5ac9e70b094ff22fd
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Wed May 7 04:02:53 2008 +0900
Fix bogus warning in sysdev_driver_register()
if ((drv->entry.next != drv->entry.prev) ||
(drv->entry.next != NULL)) {
warns list_empty(&drv->entry).
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Cc: Greg KH <gregkh at suse.de>
Cc: Len Brown <lenb at kernel.org>
[ Version 2 totally redone based on suggestions from Linus & Greg ]
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ce07c7b61e74af35a05060a2d6341f68fd92c9e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 13:13:37 2008 -0700
VFS: fix unused variable warning
Commit 33dcdac2df54e66c447ae03f58c95c7251aa5649 ("kill ->put_inode")
removed the final use of i_op->put_inode, but left the now totally
unused "op" variable in iput().
Get rid of it.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aeed5fce37196e09b4dac3a1c00d8b7122e040ce
Author: Hugh Dickins <hugh at veritas.com>
Date: Tue May 6 20:49:23 2008 +0100
x86: fix PAE pmd_bad bootup warning
Fix warning from pmd_bad() at bootup on a HIGHMEM64G HIGHPTE x86_32.
That came from 9fc34113f6880b215cbea4e7017fc818700384c2 x86: debug pmd_bad();
but we understand now that the typecasting was wrong for PAE in the previous
version: pagetable pages above 4GB looked bad and stopped Arjan from booting.
And revert that cded932b75ab0a5f9181ee3da34a0a488d1a14fd x86: fix pmd_bad
and pud_bad to support huge pages. It was the wrong way round: we shouldn't
weaken every pmd_bad and pud_bad check to let huge pages slip through - in
part they check that we _don't_ have a huge page where it's not expected.
Put the x86 pmd_bad() and pud_bad() definitions back to what they have long
been: they can be improved (x86_32 should use PTE_MASK, to stop PAE thinking
junk in the upper word is good; and x86_64 should follow x86_32's stricter
comparison, to stop thinking any subset of required bits is good); but that
should be a later patch.
Fix Hans' good observation that follow_page() will never find pmd_huge()
because that would have already failed the pmd_bad test: test pmd_huge in
between the pmd_none and pmd_bad tests. Tighten x86's pmd_huge() check?
No, once it's a hugepage entry, it can get quite far from a good pmd: for
example, PROT_NONE leaves it with only ACCESSED of the KERN_PGTABLE bits.
However... though follow_page() contains this and another test for huge
pages, so it's nice to keep it working on them, where does it actually get
called on a huge page? get_user_pages() checks is_vm_hugetlb_page(vma) to
to call alternative hugetlb processing, as does unmap_vmas() and others.
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Earlier-version-tested-by: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Jeff Chua <jeff.chua.linux at gmail.com>
Cc: Hans Rosenfeld <hans.rosenfeld at amd.com>
Cc: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bb78be8397d3b0900af3d717672218ee3ea07985
Merge: 31d9168d27fac127d449cb9fa252d880de872c7f 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 11:39:57 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] fix SMP ordering hole in fcntl_setlk()
[PATCH] kill ->put_inode
[PATCH] fix reservation discarding in affs
commit 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue May 6 13:58:34 2008 -0400
[PATCH] fix SMP ordering hole in fcntl_setlk()
fcntl_setlk()/close() race prevention has a subtle hole - we need to
make sure that if we *do* have an fcntl/close race on SMP box, the
access to descriptor table and inode->i_flock won't get reordered.
As it is, we get STORE inode->i_flock, LOAD descriptor table entry vs.
STORE descriptor table entry, LOAD inode->i_flock with not a single
lock in common on both sides. We do have BKL around the first STORE,
but check in locks_remove_posix() is outside of BKL and for a good
reason - we don't want BKL on common path of close(2).
Solution is to hold ->file_lock around fcheck() in there; that orders
us wrt removal from descriptor table that preceded locks_remove_posix()
on close path and we either come first (in which case eviction will be
handled by the close side) or we'll see the effect of close and do
eviction ourselves. Note that even though it's read-only access,
we do need ->file_lock here - rcu_read_lock() won't be enough to
order the things.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a815752ac0ffdb910e92958d41d28f4fb28e5296
Merge: 5ade9deaaa3e1f7291467d97b238648e43eae15e a15306365a16380f3bafee9e181ba01231d4acd7
Author: Steve French <sfrench at us.ibm.com>
Date: Tue May 6 17:55:32 2008 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
commit 33dcdac2df54e66c447ae03f58c95c7251aa5649
Author: Christoph Hellwig <hch at lst.de>
Date: Tue Apr 29 17:46:26 2008 +0200
[PATCH] kill ->put_inode
And with that last patch to affs killing the last put_inode instance we
can finally, after many years of transition kill this racy and awkward
interface.
(It's kinda funny that even the description in
Documentation/filesystems/vfs.txt was entirely wrong..)
Also remove a very misleading comment above the defintion of
struct super_operations.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit dca3c33652e437ed02c30ed3eca3cecd0cc00838
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Tue Apr 29 17:02:20 2008 +0200
[PATCH] fix reservation discarding in affs
- remove affs_put_inode, so preallocations aren't discared unnecessarily
often.
- remove affs_drop_inode, it's called with a spinlock held, so it can't
use a mutex.
- make i_opencnt atomic
- avoid direct b_count manipulations
- a few allocation failure fixes, so that these are more gracefully
handled now.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5
Author: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Date: Tue May 6 12:37:15 2008 -0500
[POWERPC] 4xx: Fix PCI mem in sequoia DTS
This patch is fixes the sequoia.dts device tree file to use the values defined
in the 440Epx data sheet from AMCC.
That fixes an issue where some devices, including graphics cards, would not
initialize properly because the PCI resource space was not big enough.
Signed-off-by: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit 80daac3f86d4f5aafc9d3e79addb90fa118244e2
Author: Stefan Roese <sr at denx.de>
Date: Tue Apr 22 00:54:30 2008 +1000
[POWERPC] 4xx: Add endpoint support to 4xx PCIe driver
This patch adds basic endpoint support to the 4xx PCIe driver.
This is done by checking the device_type property of the PCIe
device node ("pci" for root-complex and "pci-endpoint" for endpoint
configuration).
Note: Currently we map a fixed 64MByte window to PLB address 0 (SDRAM).
This should probably be configurable via a dts property.
Signed-off-by: Stefan Roese <sr at denx.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit f227ec3ca2b7be449fb2156e82b40cceed87a34a
Author: Kok, Auke <auke-jan.h.kok at intel.com>
Date: Tue Apr 29 11:18:55 2008 -0700
e1000e: don't return half-read eeprom on error
On a read error, e1000e might have returned uninitialized block of
eeprom data back to userspace. The convention is that 0xff is "empty",
so mark the entire eeprom as empty in case of an error.
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e410553fd35afd6d290b65e02dc501722406377d
Author: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
Date: Tue Apr 29 13:03:57 2008 +0200
ucc_geth: Don't use RX clock as TX clock.
Commit 9fb1e350e16164d56990dde036ae9c0a2fd3f634,
ucc_geth: use rx-clock-name and tx-clock-name device tree properties
Introduced a typo that made the driver use the RX clock
as TX clock, causing massive TX errors.
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1b3aa7afb60d34867eea5e73ee943b2a026fc47c
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 29 14:29:30 2008 +0100
cxgb3: Use CAP_SYS_RAWIO for firmware
Otherwise theoretically at least
CAP_NET_ADMIN
Reload new firmware
Wait..
Firmware patches kernel
So it should be CAY_SYS_RAWIO - not that I suspect this is in fact a
credible attack vector!
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 01935d7d2c544a5dfc8313f79ed164d45115aa33
Author: Don Fry <pcnet32 at verizon.net>
Date: Tue Apr 29 13:49:58 2008 -0700
pcnet32: delete non NAPI code from driver.
Delete the non-napi code from the driver and Kconfig.
Tested x86_64. Apply at next open opportunity.
Signed-off-by: Don Fry <pcnet32 at verizon.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a86e2cbe263c193a70b2e5c5a0c7e53ed39fc0ad
Author: Scott Wood <scottwood at freescale.com>
Date: Fri May 2 13:42:41 2008 -0500
fs_enet: Fix a memory leak in fs_enet_mdio_probe
There are more memory leaks in the !PPC_CPM_NEW_BINDING case, but that code
will disappear soon along with arch/ppc.
Reported by Daniel Marjamki <danielm77 at spray.se> at
http://bugzilla.kernel.org/show_bug.cgi?id=10591
Signed-off-by: Scott Wood <scottwood at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 46fa06170d59b6b9951d09354829d85090f0d911
Author: Bruce Robson <bns_robson at hotmail.com>
Date: Fri May 2 13:40:53 2008 -0700
[netdrvr] eexpress: IPv6 fails - multicast problems
Taken from http://bugzilla.kernel.org/show_bug.cgi?id=10577
I was unable to access a computer containing an Intel EtherExpress 16 network
card using IPv6.
I traced this to failure of neighbour discovery. When I used an "ip -6 neigh
add" command, on the computer attempting access, to insert a binding between
the IPv6 address of the computer with the Intel EtherExpress 16 network card
and the card's ethernet address, I was able to access that computer using
IPv6.
Neighbour discovery requires working multicast. The driver sources file
eexpress.c contains an approximately 30 line function eexp_setup_filter used
when loading multicast addresses.
I found 3 problems in this function
1) It wrote the number of multicast addresses to the card instead of the
number of bytes in the multicast addresses.
2) When loading multiple multicast addresses it loaded the first one
provided multiple times instead of loading each one once.
3) The setting of pointer 'data' from 'dmi->dmi_addr' occured before the
test for the error situation of 'dmi' being NULL.
Correcting these problems allows the computer with the Intel EtherExpress 16
network card to found by IPv6 neighbour discovery.
p.s. There is some information on the Intel EtherExpress 16 at
http://www.intel.com/support/etherexpress/vintage/sb/cs-013500.htm
Datasheet for the Intel 82586 ethernet controller used by the card
http://www.datasheetcatalog.com/datasheets_pdf/8/2/5/8/82586.shtml
Signed-off-by: Bruce Robson <bns_robson at hotmail.com>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1daad055bfc928dfc8590664c455960059421151
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Mon May 5 14:01:29 2008 +0200
3c59x: use netstats in net_device structure
Use net_device_stats from net_device structure instead of local.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Acked-by: Steffen Klassert <klassert at mathematik.tu-chemnitz.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit aa807f79dad3d6a8e9b175d66418b0c5be1d5cd8
Author: Gunnar Larisch <Gunnar.Larisch at gmx.de>
Date: Mon May 5 14:01:28 2008 +0200
3c980-TX needs EXTRA_PREAMBLE
The ethernet card 3c980-TX needs a mdio_sync() to initialize the ethernet
properly. This is forced by adding an EXTRA_PREAMBLE to its drv_flags.
Without this, the driver did not reconnect after a link loss.
Signed-off-by: Gunnar Larisch <Gunnar.Larisch at gmx.de>
Acked-by: Steffen Klassert <klassert at mathematik.tu-chemnitz.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 54c852a2d61bb15d9b979410c2260edfb23d448c
Merge: 7ab267d4ecdad3032d6bb31619a2744fc2074b59 ce4e2e4558903ef92edf1ab4e09b0b338a09fd61
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue May 6 12:22:03 2008 -0400
Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
commit 31d9168d27fac127d449cb9fa252d880de872c7f
Merge: 4880d10927c93d858d40e297361fff375ee98492 05177f178efe1459d2d0ac05430027ba201889a4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 09:17:03 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (27 commits)
pata_atiixp: Don't disable
sata_inic162x: update intro comment, up the version and drop EXPERIMENTAL
sata_inic162x: add cardbus support
sata_inic162x: kill now unused SFF related stuff
sata_inic162x: use IDMA for ATAPI commands
sata_inic162x: use IDMA for non DMA ATA commands
sata_inic162x: kill now unused bmdma related stuff
sata_inic162x: use IDMA for ATA_PROT_DMA
sata_inic162x: update TF read handling
sata_inic162x: add / update constants
sata_inic162x: misc clean ups
sata_mv use hweight16() for bit counting (V2)
sata_mv NCQ-EH for FIS-based switching
sata_mv delayed eh handling
libata: export ata_eh_analyze_ncq_error
sata_mv new mv_port_intr function
sata_mv fix mv_host_intr bug for hc_irq_cause
sata_mv NCQ and SError fixes for mv_err_intr
sata_mv rearrange mv_config_fbs
sata_mv errata workaround for sata25 part 1
...
commit 7ab267d4ecdad3032d6bb31619a2744fc2074b59
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue May 6 12:16:24 2008 -0400
fix warning in drivers/net/appletalk/cops.c
drivers/net/appletalk/cops.c: In function ‘cops_reset’:
drivers/net/appletalk/cops.c:507: warning: comparison of distinct pointer
types lacks a cast
by replacing hand-woven msleep() with call to msleep()
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 97ac8caee238d2a81c23661916f7acd3a22c85fe
Author: Bruce Allan <bruce.w.allan at intel.com>
Date: Tue Apr 29 09:16:05 2008 -0700
e1000e: Add support for BM PHYs on ICH9
This patch adds support for the BM PHY, a new PHY model being used
on ICH9-based implementations.
This new PHY exposes issues in the ICH9 silicon when receiving
jumbo frames large enough to use more than a certain part of the
Rx FIFO, and this unfortunately breaks packet split jumbo receives.
For this reason we re-introduce (for affected adapters only) the
jumbo single-skb receive routine back so that people who do
wish to use jumbo frames on these ich9 platforms can do so.
Part of this problem has to do with CPU sleep states and to make
sure that all the wake up timings are correctly we force them
with the recently merged pm_qos infrastructure written by Mark
Gross. (See http://lkml.org/lkml/2007/10/4/400).
To make code read a bit easier we introduce a _IS_ICH flag so
that we don't need to do mac type checks over the code.
Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e284e5c6601cbb16e48854be26aa57a8fa844e35
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Tue Apr 29 19:53:18 2008 +0400
uli526x: fix endianness issues in the setup frame
This patch fixes uli526x driver's issues on a PowerPC boards: uli chip
is unable to receive the packets.
It appears that send_frame_filter prepares the setup frame in the
endianness unsafe manner. On a big endian machines we should shift
the address nibble by two bytes.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit afd8e39919c913993ac2f9984af8a9ba21c63d27
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Tue Apr 29 19:53:13 2008 +0400
uli526x: initialize the hardware prior to requesting interrupts
The firmware on MPC8610HPCD boards enables ULI ethernet and leaves it
in some funky state before booting Linux. For drivers, it's always good
idea to (re)initialize the hardware prior to requesting interrupts.
This patch fixes the following oops:
Oops: Kernel access of bad area, sig: 11 [#1]
MPC86xx HPCD
NIP: c0172820 LR: c017287c CTR: 00000000
[...]
NIP [c0172820] allocate_rx_buffer+0x2c/0xb0
LR [c017287c] allocate_rx_buffer+0x88/0xb0
Call Trace:
[df82bdc0] [c017287c] allocate_rx_buffer+0x88/0xb0 (unreliable)
[df82bde0] [c0173000] uli526x_interrupt+0xe4/0x49c
[df82be20] [c0045418] request_irq+0xf0/0x114
[df82be50] [c01737b0] uli526x_open+0x48/0x160
[df82be70] [c0201184] dev_open+0xb0/0xe8
[df82be80] [c0200104] dev_change_flags+0x90/0x1bc
[df82bea0] [c035fab0] ip_auto_config+0x214/0xef4
[df82bf60] [c03421c8] kernel_init+0xc4/0x2ac
[df82bff0] [c0010834] kernel_thread+0x44/0x60
Instruction dump:
4e800020 9421ffe0 7c0802a6 bfa10014 7c7e1b78 90010024 80030060 83e30054
2b80002f 419d0078 3fa0c039 48000058 <907f0010> 80630088 2f830000 419e0014
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6fee40e9b8155a4af904d69765c96c00f975acf5
Author: Andy Fleming <afleming at freescale.com>
Date: Fri May 2 13:01:23 2008 -0500
ucc_geth: Fix a bunch of sparse warnings
ucc_geth didn't have anything marked as __iomem. It was also inconsistent
with its use of in/out accessors (using them sometimes, not using them other
times). Cleaning this up cuts the warnings down from hundreds to just over a
dozen.
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9b9a8bfc8dfbe09dc57f274e32e8b06151abbad7
Author: Andy Fleming <afleming at freescale.com>
Date: Fri May 2 13:00:51 2008 -0500
phylib: Fix some sparse warnings
Declared some things static, declared some things in the header.
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f162b9d58273a9a5747211133c8ccb2de5cf5ff2
Author: Andy Fleming <afleming at freescale.com>
Date: Fri May 2 13:00:30 2008 -0500
gianfar: Fix a locking bug in gianfar's sysfs code
During sparse cleanup, found a locking bug. Some of the sysfs functions were
acquiring a lock, and then returning in the event of an error. We rearrange
the code so that the lock is released in error conditions, too.
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 569f0c4d909c7f73de634abcdc36344cb72de36a
Author: Jay Vosburgh <fubar at us.ibm.com>
Date: Fri May 2 18:06:02 2008 -0700
bonding: fix enslavement error unwinds
As part of:
commit c2edacf80e155ef54ae4774379d461b60896bc2e
Author: Jay Vosburgh <fubar at us.ibm.com>
Date: Mon Jul 9 10:42:47 2007 -0700
bonding / ipv6: no addrconf for slaves separately from master
two steps were rearranged in the enslavement process: netdev_set_master
is now before the call to dev_open to open the slave.
This patch updates the error cases and unwind process at the
end of bond_enslave to match the new order. Without this patch, it is
possible for the enslavement to fail, but leave the slave with IFF_SLAVE
set in its flags.
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ae68c39819ddf30549652962768a50edae5eec6f
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Fri May 2 17:49:39 2008 -0700
bonding: Deadlock between bonding_store_bonds and bond_destroy_sysfs.
The sysfs layer has an internal protection, that ensures, that
all the process sitting inside ->sore/->show callback exits
before the appropriate entry is unregistered (the calltraces
are rather big, but I can provide them if required).
On the other hand, bonding takes rtnl_lock in
a) the bonding_store_bonds, i.e. in ->store callback,
b) module exit before calling the sysfs unregister routines.
Thus, the classical AB-BA deadlock may occur. To reproduce run
# while :; do modprobe bonding; rmmod bonding; done
and
# while :; do echo '+bond%d' > /sys/class/net/bonding_masters ; done
in parallel.
The fix is to move the bond_destroy_sysfs out of the rtnl_lock,
but _before_ bond_free_all to make sure no bonding devices exist
after module unload.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c4ebc66a1a8e3576322a9f47f0d06ec3c96a08d7
Author: Jay Vosburgh <fubar at us.ibm.com>
Date: Fri May 2 17:49:38 2008 -0700
bonding: fix error unwind in bonding_store_bonds
Fixed an error unwind in bonding_store_bonds that didn't release
the locks it held, and consolidated unwinds into a common block at the
end of the function. Bug reported by Pavel Emelyanov <xemul at openvz.org>,
who provided a different fix.
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 822973ba79fd5a5b711270c2de7196c6b50c6687
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Fri May 2 17:49:37 2008 -0700
bonding: Do not call free_netdev for already registered device.
If the call to bond_create_sysfs_entry in bond_create fails, the
proper rollback is to call unregister_netdevice, not free_netdev.
Otherwise - kernel BUG at net/core/dev.c:4057!
Checked with artificial failures injected into bond_create_sysfs_entry.
Pavel's original patch modified by Jay Vosburgh to move code around
for clarity (remove goto-hopping within the unwind block).
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 05177f178efe1459d2d0ac05430027ba201889a4
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Fri May 2 15:13:39 2008 -0700
pata_atiixp: Don't disable
A couple of distributions (Fedora, Ubuntu) were having weird problems with the
ATI IXP series PATA controllers being reported as simplex. At the heart of
the problem is that both distros ignored the recommendations to load pata_acpi
and ata_generic *AFTER* specific host drivers.
The underlying cause however is that if you D3 and then D0 an ATI IXP it
helpfully throws away some configuration and won't let you rewrite it.
Add checks to ata_generic and pata_acpi to pin ATIIXP devices. Possibly the
real answer here is to quirk them and pin them, but right now we can't do that
before they've been pcim_enable()'d by a driver.
I'm indebted to David Gero for this. His bug report not only reported the
problem but identified the cause correctly and he had tested the right values
to prove what was going on
[If you backport this for 2.6.24 you will need to pull in the 2.6.25
removal of the bogus WARN_ON() in pcim_enagle]
Signed-off-by: Alan Cox <alan at redhat.com>
Tested-by: David Gero <davidg at havidave.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 22bfc6d5e19b72d50535ce32fd6dee2ce2e75775
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:17 2008 +0900
sata_inic162x: update intro comment, up the version and drop EXPERIMENTAL
sata_inic162x is now ready for production use. Bump the version,
explain what's working and what's not and drop EXPERIMENTAL.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ba66b242b1c3432b44d893c64124522b3bdce71e
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:16 2008 +0900
sata_inic162x: add cardbus support
When attached to cardbus, mmio region is at BAR 1. Other than that,
everything else is the same. Add support for it.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f8b0685a8ea8e3974f8953378ede2111f8d49d22
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:15 2008 +0900
sata_inic162x: kill now unused SFF related stuff
sata_inic162x now doesn't use any SFF features. Remove all SFF
related stuff.
* Mask unsolicited ATA interrupts. This removes our primary source of
spurious interrupts and spurious interrupt handling can be tightened
up. There's no need to clear ATA interrupts by reading status
register either.
* Don't dance with IDMA_CTL_ATA_NIEN and simplify accesses to
IDMA_CTL.
* Inherit from sata_port_ops instead of ata_sff_port_ops.
* Don't initialize or use ioaddr. There's no need to map BAR0-4
anymore.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b3f677e501a494aa1582d4ff35fb3ac6f0a59b08
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:14 2008 +0900
sata_inic162x: use IDMA for ATAPI commands
Use IDMA for ATAPI commands. Write and some misc commands time out
when executed using ATAPI_PROT_DMA but ATAPI_PROT_PIO works fine. As
PIO is driven by DMA too, it doesn't make any noticeable difference
for native SATA devices. inic_check_atapi_dma() is implemented to
force PIO for those ATAPI commands.
After this change, sata_inic162x issues all commands using IDMA.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 049e8e04986bde66df9648d88d0960ab4cbd6992
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:13 2008 +0900
sata_inic162x: use IDMA for non DMA ATA commands
Use IDMA for PIO and non-data commands. This allows sata_inic162x to
safely drive LBA48 devices. Kill inic_dev_config() which contains
code to reject LBA48 devices.
With this change, status checking in inic_qc_issue() to avoid hard
lock up after hotplug can go away too.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ab5b0235c4e819c9bc45fa62c99f9fe49e73e701
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:12 2008 +0900
sata_inic162x: kill now unused bmdma related stuff
sata_inic162x doesn't use BMDMA anymore. Kill bmdma related stuff.
* prdctl manipulation
* port IRQ mask manipulation
* inherit ATA_BASE_SHT instead of ATA_BMDMA_SHT
* BMDMA methods
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3ad400a92e9c7d2f7caa6c6f811dad9b7d3f333c
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:11 2008 +0900
sata_inic162x: use IDMA for ATA_PROT_DMA
The modified driver on initio site has enough clue on how to use IDMA.
Use IDMA for ATA_PROT_DMA.
* LBA48 now works as long as it uses DMA (LBA48 devices still aren't
allowed as it can destroy data if PIO is used for any reason).
* No need to mask IRQs for read DMAs as IDMA_DONE is properly raised
after transfer to memory is actually completed. There will be some
spurious interrupts but host_intr will handle it correctly and
manipulating port IRQ mask interacts badly with the other port for
some reason, so command type dependent port IRQ masking is not used
anymore.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 364fac0e56b9bd379330ef9e39d3761f0b491e2c
Author: Tejun Heo <htejun at gmail.com>
Date: Thu May 1 23:55:58 2008 +0900
sata_inic162x: update TF read handling
inic162x can't reliably read back TF or at least we don't know how to
do it yet. The only values which seem reliable are status and error.
This patch updates access to TF.
* implement inic_tf_read() which reads the TF area in mmio area
* implement custom inic_qc_fill_rtf() which only returns true if
status indicates device error. it'll be returning bogus addresses
for device errors but it'll be able to report why it failed at
least.
* implement custom inic_check_ready() and use ata_wait_after_reset()
instead of the SFF version.
* use inic_tf_read() for classification.
This is not perfect but it fixes hotplug detection failure and at
least makes the driver report 0's instead of random garbages while
reporting valid status and error for device errors.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b0dd9b8ef985291a8b40118c5f33b7935e273dcb
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:09 2008 +0900
sata_inic162x: add / update constants
* add a bunch of constants, most are from the datasheet, a few
undocumented ones are from initio's modified driver
* HCTL_PWRDWN is bit 12 not 13
This is in preparation of further inic162x updates.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 36f674d9a65264d3826ca7300bed441e22a624b2
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:08 2008 +0900
sata_inic162x: misc clean ups
* use larger indents for structure member definitions
* kill unused variable @addr in inic_scr_write()
* kill unnecessary flushes in inic_freeze/thaw()
* kill buggy explicit kfree() on devres managed port private data
This is in preparation of further inic162x updates.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c46938ccfe35a58a0873715ee4c26fc9eb8d87b3
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 14:02:28 2008 -0400
sata_mv use hweight16() for bit counting (V2)
Some tidying as suggested by Grant Grundler.
Nuke local bit-counting function from sata_mv in favour of using hweight16().
Also add a short explanation for the 15msec timeout used when waiting for empty/idle.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4c299ca3649ccf666819e7d4a27a68c39fa174f1
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:16:20 2008 -0400
sata_mv NCQ-EH for FIS-based switching
Convert sata_mv's EH for FIS-based switching (FBS) over to the
sequence recommended by Marvell. This enables us to catch/analyze
multiple failed links on a port-multiplier when using NCQ.
To do this, we clear the ERR_DEV bit in the EDMA Halt-Conditions register,
so that the EDMA engine doesn't self-disable on the first NCQ error.
Our EH code sets the MV_PP_FLAG_DELAYED_EH flag to prevent new commands
being queued while we await completion of all outstanding NCQ commands
on all links of the failed PM.
The SATA Test Control register tells us which links have failed,
so we must only wait for any other active links to finish up
before we stop the EDMA and run the .error_handler afterward.
The patch also includes skeleton code for handling of non-NCQ FBS operation.
This is more for documentation purposes right now, as that mode is not yet
enabled in sata_mv.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 29d187bb1e30682e228ce461c487d78d945c3e4f
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:15:37 2008 -0400
sata_mv delayed eh handling
Introduce a new "delayed error handling" mechanism in sata_mv,
to enable us to eventually deal with multiple simultaneous NCQ
failures on a single host link when a PM is present.
This involves a port flag (MV_PP_FLAG_DELAYED_EH) to prevent new
commands being queued, and a pmp bitmap to indicate which pmp links
had NCQ errors.
The new mv_pmp_error_handler() uses those values to invoke
ata_eh_analyze_ncq_error() on each failed link, prior to freezing
the port and passing control to sata_pmp_error_handler().
This is based upon a strategy suggested by Tejun.
For now, we just implement the delayed mechanism.
The next patch in this series will add the multiple-NCQ EH code
to take advantage of it.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 10acf3b0d3b46c6ef5d6f0722f72ad9b743ea848
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:14:53 2008 -0400
libata: export ata_eh_analyze_ncq_error
Export ata_eh_analyze_ncq_error() for subsequent use by sata_mv,
as suggested by Tejun.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a90103298fd5ccd9a9df6d47bde9a3f371707037
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:14:02 2008 -0400
sata_mv new mv_port_intr function
Separate out the inner loop body of mv_host_intr()
into it's own function called mv_port_intr().
This should help maintainabilty.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit eabd5eb1cb59bfb162e7aa23007248f2bb480816
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:13:27 2008 -0400
sata_mv fix mv_host_intr bug for hc_irq_cause
Remove the unwanted reads of hc_irq_cause from mv_host_intr(),
thereby removing a bug whereby we were not always reading it when needed..
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 37b9046a3e433a0b0c39ad1e81ec187d5be800ba
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:12:34 2008 -0400
sata_mv NCQ and SError fixes for mv_err_intr
Sigh. Undo some earlier changes to mv_port_intr(),
so that we now read/clear SError again in all cases.
Arrange the top of the function to be as close as possible
to what we need for a later update (in this series) for ERR_DEV handling.
Fix things so that libata-eh can attempt a READ_LOG_EXT_10H
in response to a failed NCQ command, by just doing a local
mv_eh_freeze() rather than ata_port_freeze().
This will now fully handle NCQ errors much of the time,
but more fixes are needed for FBS/PMP, and for certain chip errata.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 00f42eabb204c68fa64ef72de834e74aca15c81f
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:11:45 2008 -0400
sata_mv rearrange mv_config_fbs
Rearrange mv_config_fbs() to more closely follow the (corrected) datasheet
recommendations for NCQ and FIS-based switching (FBS).
Also, maintain a port flag to let us know when FBS is enabled.
We will make more use of that flag later in this patch series.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit dd2890f60f8e15f14c8eb132779b2f15c49d1203
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:10:56 2008 -0400
sata_mv errata workaround for sata25 part 1
Part 1 of workaround for errata "sata#25" for the 60x1 series
(the second half of this errata workaround is still in development.
Bit22 of the GPIO port has to be set "on" when in NCQ mode.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3e4a139107e497a741c26f8a377a10f214d63ec1
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:10:02 2008 -0400
sata_mv new mv_qc_defer method
The EDMA engine cannot tolerate a mix of NCQ/non-NCQ commands,
and cannot be used for PIO at all. So we need to prevent libata
from trying to feed us such mixtures.
Introduce mv_qc_defer() for this purpose, and use it for all chip versions.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9b2c4e0bae854fb5e88c9cacc0dacf21631c5cb0
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:09:14 2008 -0400
sata_mv wait for empty+idle
When performing EH, it is recommended to wait for the EDMA engine
to empty out requests-in-progress before disabling EDMA.
Introduce code to poll the EDMA_STATUS register for idle/empty bits
before disabling EDMA. For non-EH operation, this will normally exit
without delay, other than the register read.
A later series of patches may focus on eliminating this and various
other register reads (when possible) throughout the driver,
but for now we're focussing on solid reliablity.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 616d4a98ad8749ebe17a8fcac67df65c321350ac
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:08:32 2008 -0400
sata_mv pci features
Some of the GenIIe EDMA optimizations should not be used
for non-PCI (SOC) devices, and nor for certain configurations
of conventional PCI (non PCI-X, PCIe) buses.
Logic taken/simplified from that in the Marvell proprietary driver.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8e7decdb8b132ee970a2636931b7653dec6af472
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:07:51 2008 -0400
sata_mv more cosmetic changes
More cosmetic changes; no code changes.
-- try and improve consistency of naming.
-- add missing _OFS to tails of register offset definitions.
-- rename mv_setup_ifctl() to mv_setup_ifcfg(), since that's what it really does.
-- remove/move some dead comments
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a96df496ed1496f3e52a9b3c860cf967aa48adda
Author: Stefan Roese <sr at denx.de>
Date: Mon May 5 16:53:19 2008 +1000
[POWERPC] 4xx: Fix problem with new TLB storage attibute fields on 440x6 core
The new 440x6 core used on AMCC 460EX/GT introduces new storage attibure
fields to the TLB2 word. Those are:
Bit 11 12 13 14 15
WL1 IL1I IL1D IL2I IL2D
With these bits the cache (L1 and L2) can be configured in a more flexible
way, instruction- and data-cache independently now. The "old" I and W bits
are still available and setting these old bits will automically set these
new bits too (for backward compatibilty).
The current code does not clear these fields resulting in disabling the cache
by chance. This patch now makes sure that these new bits are cleared when
the TLB2 word is written.
Signed-off-by: Stefan Roese <sr at denx.de>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit 07ab85de4d960b6f39395e51c1853485ad120de5
Author: Alek Du <alek.du at intel.com>
Date: Tue May 6 21:31:41 2008 +0800
libata: Add Intel SCH PATA driver
This patch adds Intel SCH chipsets (AF82US15W, AF82US15L, AF82UL11L)
PATA controller support.
Signed-off-by: Alek Du <alek.du at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit cb6716c879ecf49e2af344926c6a476821812061
Author: Tejun Heo <htejun at gmail.com>
Date: Thu May 1 10:03:08 2008 +0900
ata_piix: verify SIDPR access before enabling it
On certain configurations (certain macbooks), even though all the
conditions for SIDPR access described in the datasheet are met,
actually reading those registers just returns 0 and have no effect on
write. Verify SIDPR is actually working before enabling it.
This is reported by Ryan Roth in bz#10512.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Ryan Roth <ryan.roth at ch2m.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 78ab88f04f44bed566d51dce0c7cbfeff6449a06
Author: Tejun Heo <htejun at gmail.com>
Date: Thu May 1 23:41:41 2008 +0900
libata: improve post-reset device ready test
Some controllers (jmb and inic162x) use 0x77 and 0x7f to indicate that
the device isn't ready yet. It looks like they use 0xff if device
presence is detected but connection isn't established. 0x77 or 0x7f
after connection is established and use the value from signature FIS
after receiving it.
This patch implements ata_check_ready(), which takes TF status value
and determines whether the port is ready or not considering the above
and other conditions, and use it in @check_ready() functions. This is
safe as both 0x77 and 0x7f aren't valid ready status value even though
they have BSY bit cleared.
This fixes hot plug detection failures which can be triggered with
certain drives if they aren't already spun up when the data connector
is hot plugged.
Tested on sil, sil24, ahci (jmb/ich), piix and inic162x combined with
eight drives from all major vendors.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4880d10927c93d858d40e297361fff375ee98492
Merge: a15306365a16380f3bafee9e181ba01231d4acd7 9d1045ad68fcccfaf1393cc463ab6357693e8d1d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 07:49:20 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net_cls_act: act_simple dont ignore realloc code
iwlwifi: make IWLWIFI a tristate
Revert "atm: Do not free already unregistered net device."
dccp: return -EINVAL on invalid feature length
irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c
irda: fix !PNP support in drivers/net/irda/nsc-ircc.c
net_cls_act: Make act_simple use of netlink policy.
ip: Use inline function dst_metric() instead of direct access to dst->metric[]
ip: Make use of the inline function dst_metric_locked()
atm: Bad locking on br2684_devs modifications.
atm: Do not free already unregistered net device.
mac80211: Do not free net device after it is unregistered.
bridge: Consolidate error paths in br_add_bridge().
bridge: Net device leak in br_add_bridge().
niu: Fix probing regression for maramba on-board chips.
lapbeth: Release ->ethdev when unregistering device.
xfrm: convert empty xfrm_audit_* macros to functions
net: Fix useless comment reference loop.
sch_htb: remove from event queue in htb_parent_to_leaf()
commit 9d1045ad68fcccfaf1393cc463ab6357693e8d1d
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date: Tue May 6 00:10:24 2008 -0700
net_cls_act: act_simple dont ignore realloc code
reallocation of the policy data was being ignored. It could fail.
Simplify so that there is no need for reallocating.
Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1da5ea1a8bf4ddb82831528223c853821cb1c9ab
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue May 6 00:04:47 2008 -0700
iwlwifi: make IWLWIFI a tristate
IWLWIFI should be a tristate so that if IWLCORE and/or IWL3945 are m
and none of them is y kbuild doesn't create an empty
drivers/net/wireless/built-in.o
This patch also removes the pointless "default n".
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5f6b1ea41b46bc63f667f9b30d939b49734c20b0
Author: David S. Miller <davem at davemloft.net>
Date: Tue May 6 00:00:16 2008 -0700
Revert "atm: Do not free already unregistered net device."
This reverts commit 65e4113684e50cee75357ce10dc9026b0929e4e9.
Unlike the other cases Pavel fixed, this case did not
setup a netdev->destructor of free_netdev, therefore this
change was not correct.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a15306365a16380f3bafee9e181ba01231d4acd7
Merge: bb896afe2089575ca1bb1fbf3f07b934e1ba999b c5057ddccbcb4bf363af628d7963a7475f4114a7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 17:31:41 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
mlx4_core: Support creation of FMRs with pages smaller than 4K
IB/ehca: Fix function return types
RDMA/cxgb3: Bump up the MPA connection setup timeout.
RDMA/cxgb3: Silently ignore close reply after abort.
RDMA/cxgb3: QP flush fixes
IB/ipoib: Fix transmit queue stalling forever
IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
commit bb896afe2089575ca1bb1fbf3f07b934e1ba999b
Merge: 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c aac6abca858386438d9a7233c3471d2ecfa2f704
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 17:31:14 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
sched: default to n for GROUP_SCHED and FAIR_GROUP_SCHED
sched: add optional support for CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
sched, x86: add HAVE_UNSTABLE_SCHED_CLOCK
sched: fix cpu clock
sched: fair-group: fix a Div0 error of the fair group scheduler
sched: fix missing locking in sched_domains code
sched: make clock sync tunable by architecture code
sched: fix debugging
sched: fix sched_info_switch not being called according to documentation
sched: fix hrtick_start_fair and CPU-Hotplug
sched: fix SCHED_FAIR wake-idle logic error
sched: fix RT task-wakeup logic
sched: add statics, don't return void expressions
sched: add debug checks to idle functions
sched: remove old sched doc
sched: make rt_sched_class, idle_sched_class static
sched: optimize calc_delta_mine()
sched: fix normalized sleeper
commit 826be063eee9b4c2703fd86cfc9723bc391ff1cb
Author: Christoph Hellwig <hch at lst.de>
Date: Tue May 6 09:24:24 2008 +1000
[POWERPC] spufs: spu_create should send inotify IM_CREATE event
Creating a spufs context or gand using spu_create should send an inotify
event so that things like performance monitors have an easy way to find
out about newly created contexts.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit c5057ddccbcb4bf363af628d7963a7475f4114a7
Author: Oren Duer <oren at mellanox.co.il>
Date: Mon May 5 15:56:52 2008 -0700
mlx4_core: Support creation of FMRs with pages smaller than 4K
Don't hard code a test against a minimum page shift of 12, since the
device may support smaller pages. Test against the actual smallest
page size from the device capabilities.
Signed-off-by: Oren Duer <oren at mellanox.co.il>
Signed-off-by: Jack Morgenstein <jackm at dev.mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit cf04690885972eaba830ee761de545a6956197e6
Author: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Mon May 5 15:51:49 2008 -0700
IB/ehca: Fix function return types
Also remove duplicate assignment of local_ca_ack_delay and change
min_t check for local_ca_ack_delay to u8 instead of int.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c
Merge: 17aa7e034416e3080bc57a786d09ba0a4a044561 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 15:48:53 2008 -0700
Merge branch 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Assign PDE->data before gluing PDE into /proc tree
[POWERPC] devres: Add devm_ioremap_prot()
[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
[POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
[POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex
commit 17aa7e034416e3080bc57a786d09ba0a4a044561
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon May 5 13:54:19 2008 +1000
dev_name introduction fall out fix
Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("driver-core: add
dev_name() to help transition away from using bus_id") added a static
inline dev_name() and used it in dev_printk.
Unfortunately, drivers/edac/edac_core.h defines a macro called
dev_name(). Rename the latter.
Diagnosis by Tony Breeds and Michael Ellerman.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Acked-by: Doug Thompson <dougthompson at xmission.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aac6abca858386438d9a7233c3471d2ecfa2f704
Author: Parag Warudkar <parag.warudkar at gmail.com>
Date: Sat May 3 20:42:34 2008 -0400
sched: default to n for GROUP_SCHED and FAIR_GROUP_SCHED
GROUP_SCHED is confirmed to cause unacceptable latencies, see:
http://lkml.org/lkml/2008/5/2/370.
Mark it EXPERIMENTAL and default to no for now.
Signed-off-by: Parag Warudkar <parag.warudkar at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 3e51f33fcc7f55e6df25d15b55ed10c8b4da84cd
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat May 3 18:29:28 2008 +0200
sched: add optional support for CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
this replaces the rq->clock stuff (and possibly cpu_clock()).
- architectures that have an 'imperfect' hardware clock can set
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
- the 'jiffie' window might be superfulous when we update tick_gtod
before the __update_sched_clock() call in sched_clock_tick()
- cpu_clock() might be implemented as:
sched_clock_cpu(smp_processor_id())
if the accuracy proves good enough - how far can TSC drift in a
single jiffie when considering the filtering and idle hooks?
[ mingo at elte.hu: various fixes and cleanups ]
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a5574cf65b5f03ce9ade3918764fe22e5e2371e3
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 5 23:19:50 2008 +0200
sched, x86: add HAVE_UNSTABLE_SCHED_CLOCK
add the HAVE_UNSTABLE_SCHED_CLOCK, for architectures to select.
the next change utilizes it.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit dfbf4a1bc319f0f9a31e39b2da1fa5c55e85af89
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 23 09:24:06 2008 +0200
sched: fix cpu clock
David Miller pointed it out that nothing in cpu_clock() sets
prev_cpu_time. This caused __sync_cpu_clock() to be called
all the time - against the intention of this code.
The result was that in practice we hit a global spinlock every
time cpu_clock() is called - which - even though cpu_clock()
is used for tracing and debugging, is suboptimal.
While at it, also:
- move the irq disabling to the outest layer,
this should make cpu_clock() warp-free when called with irqs
enabled.
- use long long instead of cycles_t - for platforms where cycles_t
is 32-bit.
Reported-by: David Miller <davem at davemloft.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit cb4ad1ffc7c0d8ea7dc8cd8ba303d83551716d46
Author: Miao Xie <miaox at cn.fujitsu.com>
Date: Mon Apr 28 12:54:56 2008 +0800
sched: fair-group: fix a Div0 error of the fair group scheduler
When I echoed 0 into the "cpu.shares" file, a Div0 error occured.
We found it is caused by the following calling.
sched_group_set_shares(tg, shares)
set_se_shares(tg->se[i], shares/nr_cpu_ids)
__set_se_shares(se, shares)
div64_64((1ULL<<32), shares)
When the echoed value was less than the number of processores, the result of the
sentence "shares/nr_cpu_ids" was 0, and then the system called div64() to divide
the result, the Div0 error occured.
It is unnecessary that the shares value is divided by nr_cpu_ids, I think.
Because in the function __update_group_shares_cpu() and init_tg_cfs_entry(),
the shares value isn't divided by nr_cpu_ids when setting shares of the sched
entity.
This patch fixes this bug. And echoing ULONG_MAX value into cpu.shares also
causes Div0 error, so we set a macro MAX_SHARES to limit the max value of
shares.
Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 712555ee4f873515612f89554ad1a3fda5fa887e
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Mon Apr 28 11:33:07 2008 +0200
sched: fix missing locking in sched_domains code
Concurrent calls to detach_destroy_domains and arch_init_sched_domains
were prevented by the old scheduler subsystem cpu hotplug mutex. When
this got converted to get_online_cpus() the locking got broken.
Unlike before now several processes can concurrently enter the critical
sections that were protected by the old lock.
So use the already present doms_cur_mutex to protect these sections again.
Cc: Gautham R Shenoy <ego at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 690229a0912ca2fef8b542fe4d8b73acfcdc6e24
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 23 09:31:35 2008 +0200
sched: make clock sync tunable by architecture code
make time_sync_thresh tunable to architecture code.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d7dcdc11cfa6a8860a29b09f985467b89224699d
Author: Mike Galbraith <efault at gmx.de>
Date: Tue Apr 29 12:23:09 2008 +0200
sched: fix debugging
Revert debugging commit 7ba2e74ab5a0518bc953042952dd165724bc70c9.
print_cfs_rq_tasks() can induce live-lock if a task is dequeued
during list traversal.
Signed-off-by: Mike Galbraith <efault at gmx.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 673a90a1e05c8127886f7659d1a457169378371f
Author: David Simner <djs203 at srcf.ucam.org>
Date: Tue Apr 29 10:08:59 2008 +0100
sched: fix sched_info_switch not being called according to documentation
http://bugzilla.kernel.org/show_bug.cgi?id=10545
sched_stats.h says that __sched_info_switch is "called when prev !=
next" in the comment. sched.c should therefore do that.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b328ca182f01c2a04b85e0ee8a410720b104fbcc
Author: Peter Zijlstra <peterz at infradead.org>
Date: Tue Apr 29 10:02:46 2008 +0200
sched: fix hrtick_start_fair and CPU-Hotplug
Gautham R Shenoy reported:
> While running the usual CPU-Hotplug stress tests on linux-2.6.25,
> I noticed the following in the console logs.
>
> This is a wee bit difficult to reproduce. In the past 10 runs I hit this
> only once.
>
> ------------[ cut here ]------------
>
> WARNING: at kernel/sched.c:962 hrtick+0x2e/0x65()
>
> Just wondering if we are doing a good job at handling the cancellation
> of any per-cpu scheduler timers during CPU-Hotplug.
This looks like its indeed not cancelled at all and migrates the it to
another cpu. Fix it via a proper hotplug notifier mechanism.
Reported-by: Gautham R Shenoy <ego at in.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: stable at kernel.org
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 104f64549c961a797ff5f7c59946a7caa335c5b0
Author: Gregory Haskins <ghaskins at novell.com>
Date: Mon Apr 28 12:40:01 2008 -0400
sched: fix SCHED_FAIR wake-idle logic error
We currently use an optimization to skip the overhead of wake-idle
processing if more than one task is assigned to a run-queue. The
assumption is that the system must already be load-balanced or we
wouldnt be overloaded to begin with.
The problem is that we are looking at rq->nr_running, which may include
RT tasks in addition to CFS tasks. Since the presence of RT tasks
really has no bearing on the balance status of CFS tasks, this throws
the calculation off.
This patch changes the logic to only consider the number of CFS tasks
when making the decision to optimze the wake-idle.
Signed-off-by: Gregory Haskins <ghaskins at novell.com>
CC: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8ae121ac8666b0421aa20fd80d4597ec66fa54bc
Author: Gregory Haskins <ghaskins at novell.com>
Date: Wed Apr 23 07:13:29 2008 -0400
sched: fix RT task-wakeup logic
Dmitry Adamushko pointed out a logic error in task_wake_up_rt() where we
will always evaluate to "true". You can find the thread here:
http://lkml.org/lkml/2008/4/22/296
In reality, we only want to try to push tasks away when a wake up request is
not going to preempt the current task. So lets fix it.
Note: We introduce test_tsk_need_resched() instead of open-coding the flag
check so that the merge-conflict with -rt should help remind us that we
may need to support NEEDS_RESCHED_DELAYED in the future, too.
Signed-off-by: Gregory Haskins <ghaskins at novell.com>
CC: Dmitry Adamushko <dmitry.adamushko at gmail.com>
CC: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 983ed7a66bcec9dc307d89dc7af47cdf209e56af
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 24 18:17:55 2008 -0700
sched: add statics, don't return void expressions
Noticed by sparse:
kernel/sched.c:760:20: warning: symbol 'sched_feat_names' was not declared. Should it be static?
kernel/sched.c:767:5: warning: symbol 'sched_feat_open' was not declared. Should it be static?
kernel/sched_fair.c:845:3: warning: returning void-valued expression
kernel/sched.c:4386:3: warning: returning void-valued expression
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d478c2cfaa2476f8b6876f9eb4d8fddcfa986479
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Sat Apr 26 11:30:34 2008 -0700
sched: add debug checks to idle functions
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Cc: "Justin Mattock" <justinmattock at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 733a0771df46af942b8355cd8bb15780106b4353
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Apr 28 14:05:18 2008 +0200
sched: remove old sched doc
Fabio Checconi noticed that Documentation/scheduler/sched-design.txt was
a stale copy of the old scheduler. Remove it.
Reported-by: Fabio Checconi <fabio at gandalf.sssup.it>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2abdad0a4cd8f9413f778cc998e0ee7d60b28417
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 25 10:53:13 2008 -0700
sched: make rt_sched_class, idle_sched_class static
The C files are included directly in sched.c, so they are
effectively static.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e05510d01ad1565e5e086a939261084d67ba2b10
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon May 5 23:56:17 2008 +0200
sched: optimize calc_delta_mine()
Joel noticed that the !lw->inv_weight contition isn't unlikely anymore so
remove the unlikely annotation. Also, remove the two div64_u64() inv_weight
calculations, which makes them rely on the calc_delta_mine() path as well.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
CC: Joel Schopp <jschopp at austin.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a992241de614dd2b7c97a9ba64e28c0e563f19bf
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon May 5 23:56:17 2008 +0200
sched: fix normalized sleeper
Normalized sleeper uses calc_delta*() which requires that the rq load is
already updated, so move account_entity_enqueue() before place_entity()
Tested-by: Frans Pop <elendil at planet.nl>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 19443178fbfbf40db15c86012fc37df1a44ab857
Author: Chris Wright <chrisw at sous-sol.org>
Date: Mon May 5 13:50:24 2008 -0700
dccp: return -EINVAL on invalid feature length
dccp_feat_change() validates length and on error is returning 1.
This happens to work since call chain is checking for 0 == success,
but this is returned to userspace, so make it a real error value.
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
Acked-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 108c1961847df2a875047c0fd27b419cb817d213
Merge: 48fc8de9cd093b8c9e2cfa339421862bae3a6cad 0df18ff366853cdf31e5238764ec5c63e6b5a398
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 12:39:10 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86 PCI: call dmi_check_pciprobe()
x86/pci: add pci=skip_isa_align command lines.
x86/pci: remove flag in pci_cfg_space_size_ext
x86: fix section mismatch in pci_scan_bus
commit abdefbdbd5c683ddcb1dd0d3dd414d02f078a5da
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon May 5 12:38:58 2008 -0700
sparc64: remove online_page()
The identical online_page() implementations from all architectures got
moved to mm/memory_hotplug.c - except for the sparc64 one that even was
dead code due to MEMORY_HOTPLUG not being available there.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 48fc8de9cd093b8c9e2cfa339421862bae3a6cad
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:27:21 2008 +0200
CONFIG_SCSI_MAC_ESP needs CONFIG_SCSI_SPI_ATTRS
The new mac_esp scsi driver needs CONFIG_SCSI_SPI_ATTRS, just like all other
drivers using the new esp_scsi core.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b6d9d267f0d68104df910fca89149803aec82426
Author: Finn Thain <fthain at telegraphics.com.au>
Date: Mon May 5 21:26:15 2008 +0200
m68k: remove old mac_esp cruft
Remove the rest of the old mac_esp driver. Also ditch the rest of the
machw mechanism, it needs to be replaced by a fake openfirmware tree.
Signed-off-by: Finn Thain <fthain at telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b17f136bf32984eb0faeb116bcd44ffe3503782
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Mon May 5 21:25:48 2008 +0200
m68k: Handle 68040 bus faults
Fix 68040 bus fault handling, so the standard kernel exception handling
can be used for i/o probing.
Contrary to normal access faults there is nothing to fix, but at least
we have to disable writebacks to avoid recursive faults.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4933d07531711e399d8d578036aa9fc1be2f9b20
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:16:13 2008 +0200
m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h>
drivers/input/serio/hp_sdc.c: In function 'hp_sdc_take':
drivers/input/serio/hp_sdc.c:198: error: implicit declaration of function 'up'
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 63a59fa7a74fccff64dbf7d9230bd9d91bddead4
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:15:48 2008 +0200
m68k: serial167 missing return value in cy_put_char()
commit a5b08c66194fba02a865b397579b7204688bcb1e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:05 2008 -0700
serial167: switch to int put_char method
missed one case when adding return values.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ab1a852128d6f0677999eecbf6d04bf9f6fe9a9a
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:15:19 2008 +0200
m68k: Fix falconide `data_adr' typo
commit 9567b349f7e7dd7e2483db99ee8e4a6fe0caca38
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:36 2008 +0200
ide: merge ->atapi_*put_bytes and ->ata_*put_data methods
introduced a typo (`data_adr' instead of `data_addr'), leading to a compile
failure.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8376005ea471762e7a5957d5b9e788121c0ba726
Author: David S. Miller <davem at davemloft.net>
Date: Mon May 5 12:32:39 2008 -0700
sparc64: use compat_sys_utimes instead of home-grown local copy.
Noticed by Christoph Hellwig.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5717922a1b8cc477f45a0f4f11fe619392ba7133
Merge: 50f7ad2500b27ce5c42be3a6936f143b158f7bc3 e024cbd257efc2788b7d21b9353e966267485c87
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 10:17:30 2008 -0700
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdb: kconfig fix xconfig/menuconfig element
kgdb: fix signedness mixmatches, add statics, add declaration to header
kgdb: 1000 loops for the single step test in kgdbts
kgdb: trivial sparse fixes in kgdb test-suite
kgdb: minor documentation fixes
commit 50f7ad2500b27ce5c42be3a6936f143b158f7bc3
Merge: 82af7aca56c67061420d618cc5a30f0fd4106b80 2c36eecfb6471c457994647771d1405502ad5fde
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 10:16:42 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc - fix S3C2410 i2s programming error
[ALSA] soc - fix s3c2410 PCM breakage
[ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
[ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
[ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
[ALSA] hda - Support IDT 92HD206 codec
[ALSA] pcsp: Fix build with CONFIG_PM=n
commit 0df18ff366853cdf31e5238764ec5c63e6b5a398
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Mon Apr 14 15:40:37 2008 -0700
x86 PCI: call dmi_check_pciprobe()
this change:
| commit 08f1c192c3c32797068bfe97738babb3295bbf42
| Author: Muli Ben-Yehuda <muli at il.ibm.com>
| Date: Sun Jul 22 00:23:39 2007 +0300
|
| x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata
|
| This patch introduces struct pci_sysdata to x86 and x86-64, and
| converts the existing two users (NUMA, Calgary) to use it.
|
| This lays the groundwork for having other users of sysdata, such as
| the PCI domains work.
|
| The Calgary bits are tested, the NUMA bits just look ok.
replaces pcibios_scan_root with pci_scan_bus_parented...
but in pcibios_scan_root we have a DMI check:
dmi_check_system(pciprobe_dmi_table);
when when have several peer root buses this could be called multiple
times (which is bad), so move that call to pci_access_init().
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 13a6ddb08e58a1bd344da7898c4e2f13bdf18c2f
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Thu Mar 27 01:31:18 2008 -0700
x86/pci: add pci=skip_isa_align command lines.
so we don't align the io port start address for pci cards.
also move out dmi check out acpi.c, because it has nothing to do with acpi.
it could spare some calling when we have several peer root buses.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 82af7aca56c67061420d618cc5a30f0fd4106b80
Author: Eric Sesterhenn <snakebyte at gmx.de>
Date: Fri Jan 25 10:40:46 2008 +0100
Removal of FUTEX_FD
Since FUTEX_FD was scheduled for removal in June 2007 lets remove it.
Google Code search found no users for it and NGPT was abandoned in 2003
according to IBM. futex.h is left untouched to make sure the id does
not get reassigned. Since queue_me() has no users left it is commented
out to avoid a warning, i didnt remove it completely since it is part of
the internal api (matching unqueue_me())
Signed-off-by: Eric Sesterhenn <snakebyte at gmx.de>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (removed rest)
Acked-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e024cbd257efc2788b7d21b9353e966267485c87
Author: Jan Engelhardt <jengelh at computergmbh.de>
Date: Fri Apr 25 18:35:29 2008 +0200
kgdb: kconfig fix xconfig/menuconfig element
Kconfig.kgdb: fix menuconfig element
Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 688b744d8bc84dc5cc646e97509113dc5e8818ed
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 24 16:57:23 2008 -0500
kgdb: fix signedness mixmatches, add statics, add declaration to header
Noticed by sparse:
arch/x86/kernel/kgdb.c:556:15: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
kernel/kgdb.c:149:8: warning: symbol 'kgdb_do_roundup' was not declared. Should it be static?
kernel/kgdb.c:193:22: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
kernel/kgdb.c:712:5: warning: symbol 'remove_all_break' was not declared. Should it be static?
Related to kgdb_hex2long:
arch/x86/kernel/kgdb.c:371:28: warning: incorrect type in argument 2 (different signedness)
arch/x86/kernel/kgdb.c:371:28: expected long *long_val
arch/x86/kernel/kgdb.c:371:28: got unsigned long *<noident>
kernel/kgdb.c:469:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:469:27: expected long *long_val
kernel/kgdb.c:469:27: got unsigned long *<noident>
kernel/kgdb.c:470:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:470:27: expected long *long_val
kernel/kgdb.c:470:27: got unsigned long *<noident>
kernel/kgdb.c:894:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:894:27: expected long *long_val
kernel/kgdb.c:894:27: got unsigned long *<noident>
kernel/kgdb.c:895:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:895:27: expected long *long_val
kernel/kgdb.c:895:27: got unsigned long *<noident>
kernel/kgdb.c:1127:28: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:1127:28: expected long *long_val
kernel/kgdb.c:1127:28: got unsigned long *<noident>
kernel/kgdb.c:1132:25: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:1132:25: expected long *long_val
kernel/kgdb.c:1132:25: got unsigned long *<noident>
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 7cfcd985d36031459cc64e3843ea36a4d801097d
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Thu Apr 24 16:57:23 2008 -0500
kgdb: 1000 loops for the single step test in kgdbts
The single step test is not terribly costly and it should be able to
pass at 1000 loops successfully in under 1 second. A non-kgdb timing
regression was found using this test, but it did not occur frequently
because by default the test was only executed a single time.
This patch changes the default for the single step test to 1000
iterations and allows for individual configuration of the single step
test to further exercise the kgdb subsystem when needed.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 001fddf5fdcfe2c08ac9c4e5ca80c5e5698363bb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 24 16:57:23 2008 -0500
kgdb: trivial sparse fixes in kgdb test-suite
Shadowed variable and integer as NULL pointer fixes:
drivers/misc/kgdbts.c:877:6: warning: symbol 'sys_open_test' shadows an earlier one
drivers/misc/kgdbts.c:537:27: originally declared here
drivers/misc/kgdbts.c:378:22: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:386:22: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:468:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:472:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:502:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:506:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:509:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:523:20: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:527:20: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:530:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:541:21: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:545:21: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:548:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:559:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:563:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:573:16: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:574:19: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:578:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:588:16: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:589:19: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:593:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:602:16: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:604:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:925:3: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:938:3: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit f92509371ec06227a7e29778f395776d31b0deab
Author: grzegorz.chwesewicz at chilan.com <grzegorz.chwesewicz at chilan.com>
Date: Thu Apr 24 16:57:22 2008 -0500
kgdb: minor documentation fixes
Two minor fixes to the kgdb documentation.
Signed-off-by: Grzegorz Chwesewicz, Chilan <grzegorz.chwesewicz at chilan.com>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 2c36eecfb6471c457994647771d1405502ad5fde
Author: Davide Rizzo <davide at elpa.it>
Date: Mon May 5 14:59:39 2008 +0200
[ALSA] soc - fix S3C2410 i2s programming error
S3C2410 i2s driver currently manages only i2s protocol (and not left
justified one) and slave mode.
With this small patch, other modes are possible.
Signed-off-by: Davide Rizzo <davide at elpa.it>
Acked-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d6426171bab3403cdcd5613d5549f20b0ab0967c
Author: Davide Rizzo <davide at elpa.it>
Date: Mon May 5 14:56:07 2008 +0200
[ALSA] soc - fix s3c2410 PCM breakage
S3C2410 pcm doesn't work.
s3c2410_dma_request() now returns the channel number and not 0 if OK.
Signed-off-by: Davide Rizzo <davide at elpa.it>
Acked-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2e75d050e42d1c61e820f9a35078a2f69e02cc3e
Author: Takashi Iwai <tiwai at suse.de>
Date: Sat May 3 18:46:56 2008 +0200
[ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
On boards with VT1617A codec, the sound disappears suddenly.
This looks like a problem with HPE-bit control that is supposed to be
set in patch_vt1617a(). However, on such problematic hardwares, the
bit is actually reset mysteriously.
The patch adds a workaround for the wrong quirk.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 564c5bead424fa798dfbd5fe382b4e0b7ea483fb
Author: Jacek Luczak <luczak.jacek at gmail.com>
Date: Sat May 3 18:41:23 2008 +0200
[ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
Change done by:
commit f6c7e5461e9046445d50c5c7a9a4587824239623
[ALSA] hda-codec - Fix auto-configuration of Realtek codecs
broke sound on ALC861 Analog.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 20686c24377246d9eb57782551b25ff19df09873
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 2 12:31:51 2008 +0200
[ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
FM801-tea575x tuner has a reverse selection to V4L1 and this causes
nasty dependency problems.
The patch simplifies the dependency with a normal
"depends on VIDEO_V4L1". This decreases the usability but fixes bugs,
yeah. If any better feature like "requires" is introduced to kbuild
in future, we'll be able to switch it...
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7bd3c0f73c9c5b47fd1ca49757c436e73f4cd55b
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 2 12:28:02 2008 +0200
[ALSA] hda - Support IDT 92HD206 codec
Added the support for IDT 92HD206 codec chip.
It's compatible with STAC927x.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 983e0972cea450fe5725d1ba11c78adfd5d7ad3a
Author: Johann Felix Soden <johfel at users.sourceforge.net>
Date: Fri May 2 09:54:31 2008 +0200
[ALSA] pcsp: Fix build with CONFIG_PM=n
sound/drivers/pcsp/pcsp.c: In function 'pcsp_suspend':
sound/drivers/pcsp/pcsp.c:201: error: implicit declaration of function 'snd_pcm_suspend_all'
Signed-off-by: Johann Felix Soden <johfel at users.sourceforge.net>
CC: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 5 01:06:54 2008 -0700
irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c
x86.git testing found this build bug on v2.6.26-rc1:
ERROR: "pnp_get_resource" [drivers/net/irda/smsc-ircc2.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
the driver did not anticipate the case of !CONFIG_PNP which is rare but
still possible. Instead of restricting the driver to PNP-only in the
Kconfig space, add the (trivial) dummy struct pnp_driver - this is that
other drivers use in the !PNP case too.
The driver itself can in theory be initialized on !PNP too in certain
cases, via smsc_ircc_legacy_probe().
Patch only minimally build tested, i dont have this hardware.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c17f888f8fc2e47e2b4a51424f8ccf564ae87576
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 5 01:04:06 2008 -0700
irda: fix !PNP support in drivers/net/irda/nsc-ircc.c
x86.git testing found the following build failure in latest -git:
drivers/built-in.o: In function `nsc_ircc_pnp_probe':
nsc-ircc.c:(.text+0xdf1b6): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf1d4): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf1ee): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf237): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf24c): undefined reference to `pnp_get_resource'
drivers/built-in.o:nsc-ircc.c:(.text+0xdf266): more undefined references to `pnp_get_resource' follow
make: *** [.tmp_vmlinux1] Error 1
triggered via this config:
http://redhat.com/~mingo/misc/config-Sat_May__3_20_53_13_CEST_2008.bad
while generally most users will have PNP enabled, drivers can support
non-PNP build mode too - and most drivers implement it. That is typically
done by providing a dummy pnp_driver structure that will not probe anything.
The fallback routines in the driver will handle this dumber mode of
operation too.
This patch implements that. I have not tested whether this actually
works on real hardware so take care. It does resolve the build bug.
[ Another solution that is used by a few drivers is to exclude the driver
in the Kconfig if PNP is disabled, via "depends on PNP", but this would
limit the availability of the driver needlessly. ]
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0a6db7dc49b91875ff015934df3e85b8785f2294
Author: David S. Miller <davem at davemloft.net>
Date: Mon May 5 00:33:58 2008 -0700
sbus: Fix bpp driver build.
Using the variable name 'dev_name' in the top-level namespace is a bad
idea.
This conflicts with linux/device.h's inline function of the same name.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fa1b1cff3d06550d23ef540c4f97ca83c021b473
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date: Mon May 5 00:22:35 2008 -0700
net_cls_act: Make act_simple use of netlink policy.
Convert to netlink helpers by using netlink policy validation.
As a side effect fixes a leak.
Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50
Author: Denis V. Lunev <den at openvz.org>
Date: Sat May 3 06:34:05 2008 +1000
[POWERPC] Assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
No need to check for data!=NULL after that.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Alexey Dobriyan <adobriyan at openvz.org>
Cc: Eric W. Biederman <ebiederm at xmission.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit b41e5fffe8b81fc939067d8c1c195cc79115d5a3
Author: Emil Medve <Emilian.Medve at Freescale.com>
Date: Sat May 3 06:34:04 2008 +1000
[POWERPC] devres: Add devm_ioremap_prot()
We provide an ioremap_flags, so this provides a corresponding
devm_ioremap_prot. The slight name difference is at Ben
Herrenschmidt's request as he plans on changing ioremap_flags to
ioremap_prot in the future.
Signed-off-by: Emil Medve <Emilian.Medve at Freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Acked-by: Tejun Heo <htejun at gmail.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit af3ce514ade2fd0e18c5d078d138a6c1137a33df
Author: Daniel Walker <dwalker at mvista.com>
Date: Sat May 3 06:34:03 2008 +1000
[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 56783c5e4dd32ca370ad0bdf3a9c6c1aaee94726
Author: Daniel Walker <dwalker at mvista.com>
Date: Sat May 3 06:34:02 2008 +1000
[POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 0885cb5653ff82c8d322df1b8a95843dc5f5486b
Author: Daniel Walker <dwalker at mvista.com>
Date: Sat May 3 06:34:01 2008 +1000
[POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5ffc02a158997b1eb91ade8d02bcf521ff79a218
Author: Satoru SATOH <satoru.satoh at gmail.com>
Date: Sun May 4 22:14:42 2008 -0700
ip: Use inline function dst_metric() instead of direct access to dst->metric[]
There are functions to refer to the value of dst->metric[THE_METRIC-1]
directly without use of a inline function "dst_metric" defined in
net/dst.h.
The following patch changes them to use the inline function
consistently.
Signed-off-by: Satoru SATOH <satoru.satoh at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0bbeafd0118fc3ae54990064760c889d41dc21d6
Author: Satoru SATOH <satoru.satoh at gmail.com>
Date: Sun May 4 22:12:43 2008 -0700
ip: Make use of the inline function dst_metric_locked()
Signed-off-by: Satoru SATOH <satoru.satoh at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit de1028927ae3487e2e450dacf50fbf32042aee18
Author: Luke Browning <lukebr at linux.vnet.ibm.com>
Date: Mon Apr 28 17:35:56 2008 +1000
[POWERPC] spufs: handle faults while the context switch pending flag is set
Currently, page fault handlers don't issue a mfc restart if the context
switch pending flag is set, which can leave us with a hanging DMA after
a context restore.
This patch introduces fault pending flag that is set by the fault
handler and read by the context switch code, so that the latter can add
the restart bit at the right spot, after it has successfuly saved the
state of the mfc control register.
Signed-off-by: Luke Browning <lukebr at linux.vnet.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit f3d69e0507f84903059d456c5d19f10b2df3ac69
Author: Luke Browning <lukebr at linux.vnet.ibm.com>
Date: Sun Apr 27 18:41:55 2008 +0000
[POWERPC] spufs: fix concurrent delivery of class 0 & 1 exceptions
SPU class 0 & 1 exceptions may occur in parallel, so we may end up
overwriting csa.dsisr.
This change adds dedicated fields for each class to the spu and the spu
context so that fault data is not overwritten.
Signed-off-by: Luke Browning <lukebr at linux.vnet.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 7a2142002f29a7b398c49da9bdec712dc57087c7
Author: Luke Browning <lukebr at linux.vnet.ibm.com>
Date: Mon Apr 28 14:32:34 2008 +1000
[POWERPC] spufs: try to route SPU interrupts to local node
Currently, we re-route SPU interrupts to the current cpu, which may be
on a remote node. In the case of time slicing, all spu interrupts will
end up routed to the same cpu, where the spusched_tick occurs.
This change routes mfc interrupts to the cpu where the controlling
thread last ran, provided that cpu is on the same node as the spu
(otherwise don't reroute interrupts).
This should improve performance and provide a more predictable
environment for processing spu exceptions. In the past we have seen
concurrent delivery of spu exceptions to two cpus. This eliminates that
concern.
Signed-off-by: Luke Browning <lukebr at linux.vnet.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 093c16bf9b107433643cbf0843ca7808df90823b
Author: Luke Browning <lukebr at linux.vnet.ibm.com>
Date: Fri Apr 25 14:00:00 2008 +1000
[POWERPC] spufs: set SPU_CONTEXT_SWITCH_PENDING before synchronising SPU irqs
synchronize_irq() provides the serialization for
SPU_CONTEXT_SWITCH_PENDING which is read with a simple load. This
routine guarantees that the relevant interrupt handlers are not running,
so that the next time they do run they will see the update
memory value.
This must be done correctly so that exception handling code does not
restart the mfc in the middle of a context switch while we are trying
to atomically stop it and save state.
Signed-off-by: Luke Browning <lukebr at linux.vnet.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit d29694f0681e188cf75477f20904041744e78ef7
Author: Jeremy Kerr <jk at ozlabs.org>
Date: Wed Apr 23 16:02:10 2008 +1000
[POWERPC] spufs: don't acquire state_mutex interruptible while performing callback
There's currently no way to tell if spu_process_callback has
returned with the state mutex held, as -EINTR may be returned
by either the syscall or the spu_acquire fail case.
Instead, just do a non-interruptible mutex_lock here.
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit c0bace5c7029ef7cbb6e6ffaa0469a3c042e5029
Author: Jeremy Kerr <jk at ozlabs.org>
Date: Wed Apr 23 14:24:27 2008 +1000
[POWERPC] spufs: update master runcntl with context lock held
Currently, we update the SPU master run control bit (ie,
spu_enable_spu) in spufs_run_spu before we grab the context mutex. This
can result in races with other processes accessing this context's
resources.
This change moves the spu_enable_spu to after we have acquired the
context lock.
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 55d7cd74d44e7e0597f95db25c12f3e6c5e7916f
Author: Jeremy Kerr <jk at ozlabs.org>
Date: Thu Apr 24 18:15:40 2008 +1000
[POWERPC] spufs: fix post-stopped update of MFC_CNTL register
We currently have two issues with the MFC save code:
* save_mfc_decr doesn't handle a transition of 1 -> 0 of the Ds bit
* The Q bit may be stale in the CSA
This change fixes the first issue by clearing the relevant bits from
the MFC_CNTL value in the CSA before or-ing in the updated status.
Also, we add the Q bit to the updated status.
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 1ca4264ee17745779c341966c5e61ac69bfd17a6
Author: Jeremy Kerr <jk at ozlabs.org>
Date: Wed Apr 9 15:24:22 2008 +1000
[POWERPC] spufs: fix save of mfc_cntl register
Currently, we can introduce invalid entries into the MFC queues:
1) context starts a DMA
2) context gets scheduled out during a DMA
- kernel saves MFC queue to CSA
- kernel saves 0x0 in csa->mfc_control_RW
3) context gets scheduled in
- csa->mfc_control[Q] ('queues empty') isn't set, so DMA queues are
restored from the CSA
4) context's DMA is completed
5) context gets scheduled out again, no DMA occuring this time
- kernel sees that MFC_CNTL[Q] ('queues empty') is set, so doesn't
touch saved queue data in CSA
- kernel saves 0x0 in csa->mfc_control_RW
6) context gets scheduled in
- csa->mfc_control[Q] ('queues empty') isn't set (we saved is as 0!),
so DMA queues are restored from the CSA
In this last restore, we've restored the queue status from step 2,
which are now invalid.
This change makes save_mfc_cntl() closer to the save/restore sequence,
as specified in the CBE handbook.
With changes from Luke Browning.
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 943906ba4bebf629d5cd770e48b8ec0ddc433869
Author: Jeremy Kerr <jk at ozlabs.org>
Date: Mon Apr 7 17:42:36 2008 +1000
[POWERPC] spufs: don't touch suspend bits when purging DMA queue
When we issue a MFC purge request, we may inadvertantly clear the
suspended status.
This change adds the MFC_CNTL_SUSPEND_MASK when we issue a purge
request, so that the suspend bit is masked out.
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 5711fe900dfef8d9afdbbb6d0f9c9720919d1d66
Author: Jeremy Kerr <jk at ozlabs.org>
Date: Fri Apr 4 17:55:28 2008 +1100
[POWERPC] cell: Fix lost interrupts due to fasteoi handler
We may currently lose interrupts during SPE context switch, as we alter
the INT_Route register. Because the IIC uses a per-thread priority
status, changing the interrupt routing to a different thread means that
the IRQ is no longer masked by the priority status, so we end up with
two fasteoi IRQ handlers executing for the one irq_desc. The fasteoi
handler doesn't handle multiple IRQs, so drops the second one.
Fix this by using our own flow handler. This is based on
handle_edge_irq, but issues an eoi after IRQs are handled, and doesn't
do any mask/unmasking.
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 1e0ba0060ffcee2e766ec3159196235b1a2a0ff3
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 18:00:36 2008 -0700
atm: Bad locking on br2684_devs modifications.
The list_del happens under read-locked devs_lock.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 65e4113684e50cee75357ce10dc9026b0929e4e9
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 18:00:05 2008 -0700
atm: Do not free already unregistered net device.
Both br2684_push and br2684_exit do so, but unregister_netdev()
releases the device itself.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 339a7c41c913035bf58579f6e47b4ba29da83795
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 17:59:30 2008 -0700
mac80211: Do not free net device after it is unregistered.
The error path in ieee80211_register_hw() may call the unregister_netdev()
and right after it - the free_netdev(), which is wrong, since the
unregister releases the device itself.
So the proposed fix is to NULL the local->mdev after unregister is done
and check this before calling free_netdev().
I checked - no code uses the local->mdev after unregister in this error
path (but even if some did this would be a BUG).
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 17:58:07 2008 -0700
bridge: Consolidate error paths in br_add_bridge().
This actually had to be merged with the patch #1, but I decided not to
mix two changes in one patch.
There are already two calls to free_netdev() in there, so merge them
into one.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c37aa90b0458d87342e0bb083f6bf7d113220d09
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 17:57:29 2008 -0700
bridge: Net device leak in br_add_bridge().
In case the register_netdevice() call fails the device is leaked,
since the out: label is just rtnl_unlock()+return.
Free the device.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f74d505b58d36ceeef10e459094f0eb760681165
Merge: 45ea2103d8856454503b30464cc1dba378748d00 2961b423037da60a8cb230963ee0d8c04473d73b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:12:10 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
fix asm-mips/types.h syntax error
fix asm-alpha/types.h breakage
commit 45ea2103d8856454503b30464cc1dba378748d00
Merge: 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b 62179849b40aded9e727cca5006627a1c4d6446e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:11:43 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix setup printk format warning
x86: olpc build fix
x86: video/fbdev.c: add MODULE_LICENSE
x86: fix up bootparam.h for userspace inclusion
x86: relocs ELF handling - use SELFMAG instead of numeric constant
x86: vdso ELF handling - use SELFMAG instead of numeric constant
x86: remove dell reboot dmi quirk board name match
x86: es7000 build fix
x86: make additional_cpus static
x86: make start_secondary() static
kbuild, suspend, x86: fix rebuild of wakeup.bin
uml: fix gcc problem
x86: undo visws/numaq build changes
commit 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b
Merge: eb28062f131b0a1da32b2554fd819af5221040de 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:11:24 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kconfig-language.txt: remove bogus hint
kconfig: fix MAC OS X warnings in menuconfig
modpost: i2c aliases need no trailing wildcard
commit eb28062f131b0a1da32b2554fd819af5221040de
Author: Bryan Wu <cooloney at kernel.org>
Date: Sun May 4 23:12:55 2008 +0800
task_nommu: fix compile failing bug because of spilt file.h
CC fs/proc/task_nommu.o
fs/proc/task_nommu.c: In function ‘task_mem’:
fs/proc/task_nommu.c:55: error: dereferencing pointer to incomplete type
make[2]: *** [fs/proc/task_nommu.o] Error 1
make[1]: *** [fs/proc] Error 2
make: *** [fs] Error 2
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d0dcd41d7b463de955b7ae7a55f76ff4216ed665
Merge: 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e 1024c5f4be4fc5b00337464fb8a442bebf15df68
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:08:21 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: IDE_HFLAG_SERIALIZE_DMA bugfix
commit 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e
Merge: e73b65f1db7e3baa3db43951476b7d2d2381ba35 b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:07:28 2008 -0700
Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
x86: KVM geust: make setup_secondary_clock definition dependent on local apic
KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
KVM: avoid fx_init() schedule in atomic
KVM: Avoid spurious execeptions after setting registers
KVM: PIT: support mode 4
KVM: x86 emulator: disable writeback on lmsw
KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
KVM: ppc: Handle guest idle by emulating MSR[WE] writes
KVM: x86: task switch: fix wrong bit setting for the busy flag
KVM: VMX: Enable EPT feature for KVM
KVM: VMX: Prepare an identity page table for EPT in real mode
KVM: Export necessary function for EPT
KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
KVM: MMU: Add EPT support
KVM: Add kvm_x86_ops get_tdp_level()
KVM: MMU: Move some definitions to a header file
KVM: VMX: EPT Feature Detection
commit e73b65f1db7e3baa3db43951476b7d2d2381ba35
Author: Ingo Molnar <mingo at elte.hu>
Date: Sun May 4 09:29:43 2008 +0200
sysfs: build fix
x86.git testing found the following build failure on v2.6.26-rc1:
In file included from include/linux/kobject.h:22,
from include/linux/module.h:17,
from include/linux/crypto.h:22,
from arch/x86/kernel/asm-offsets_32.c:8,
from arch/x86/kernel/asm-offsets.c:3:
include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group'
include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here
make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
make: *** [prepare0] Error 2
with the following config:
http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
the reason for the build failure is the duplicate definition of the
sysfs_update_group() inline function in include/linux/sysfs.h.
The duplication was a merge error: it was added via -mm by commit
v2.6.25-7262-g2850699, "sysfs: sysfs_update_group stub for
CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same
commit was already merged upstream via the sysfs tree, with commit
v2.6.25-7211-g1cbfb7a.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 826e4506a0acb6487910a5ebafe839f708a00e1c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:04:16 2008 -0700
Make forced module loading optional
The kernel module loader used to be much too happy to allow loading of
modules for the wrong kernel version by default. For example, if you
had MODVERSIONS enabled, but tried to load a module with no version
info, it would happily load it and taint the kernel - whether it was
likely to actually work or not!
Generally, such forced module loading should be considered a really
really bad idea, so make it conditional on a new config option
(MODULE_FORCE_LOAD), and make it default to off.
If somebody really wants to force module loads, that's their problem,
but we should not encourage it. Especially as it happened to me by
mistake (ie regular unversioned Fedora modules getting loaded) causing
lots of strange behavior.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2961b423037da60a8cb230963ee0d8c04473d73b
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat May 3 22:26:17 2008 +0300
fix asm-mips/types.h syntax error
This patch fixes the following compile error caused by
commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
(mips: types: use <asm-generic/int-*.h> for the mips architecture):
<-- snip -->
...
CC kernel/bounds.s
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
include2/asm/types.h:56:2: error: #endif without #if
make[2]: *** [kernel/bounds.s] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
commit 36bbfe2f097d5e09e8e9c83f55264bd538a0ebe1
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat May 3 23:51:03 2008 +0300
fix asm-alpha/types.h breakage
This patch fixes the following compile error on alpha caused by
commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
(alpha: types: use <asm-generic/int-*.h> for the alpha architecture):
<-- snip -->
...
CC arch/alpha/kernel/asm-offsets.s
In file included from include2/asm/topology.h:6,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1
<-- snip -->
Cc: Richard Henderson <rth at twiddle.net>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
commit 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun May 4 02:15:35 2008 +0300
kconfig-language.txt: remove bogus hint
For the use case the hint describe a simple dependency is
enough.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
commit c4143a83031aef7ba87a62cf654d6d8fb4d8e76e
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Sun May 4 21:03:20 2008 +0200
kconfig: fix MAC OS X warnings in menuconfig
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Acked-by: Timur Tabi <timur at freescale.com>
commit 62179849b40aded9e727cca5006627a1c4d6446e
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Fri May 2 13:32:35 2008 -0700
x86: fix setup printk format warning
Fix x86 setup printk format warming:
next-20080430/arch/x86/kernel/setup.c:172: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ssize_t'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Cc: mingo at elte.hu
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e26a28d190304d910ee49b81cbfe6d9241f56e86
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Sat May 3 23:49:59 2008 +0200
x86: olpc build fix
CONFIG_OLPC needs to depend on MGEODE_LX
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7b04fa014c11e6415da8b5a7999dbd201abad53c
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri May 2 13:32:32 2008 -0700
x86: video/fbdev.c: add MODULE_LICENSE
Add the missing MODULE_LICENSE("GPL").
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit afaafe50ee15c59010f19273ebfb6c44f0962d7c
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:14:20 2008 +1000
x86: fix up bootparam.h for userspace inclusion
commit 8b664aa66e824a0ddf4ec56d41fa0cf7bb374de6 (x86, boot: add linked
list of struct setup_data) put a new struct in bootparam.h, but didn't
use the userspace-safe types.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Cc: Huang Ying <ying.huang at intel.com>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8bd1796dedd50abd7553afbe6113bd97cc88390f
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Sat May 3 14:18:03 2008 +0400
x86: relocs ELF handling - use SELFMAG instead of numeric constant
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: akpm at linux-foundation.org
Cc: hpa at zytor.com
Cc: mingo at elte.hu
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ecb783eae1372d69a53d406e1bdba8284e4bafcc
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Sat May 3 14:18:01 2008 +0400
x86: vdso ELF handling - use SELFMAG instead of numeric constant
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: akpm at linux-foundation.org
Cc: hpa at zytor.com
Cc: mingo at elte.hu
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 163ea310b68bdde89b1ac633fbf8c0db290d3f86
Author: Ben <bdeb at willmore.eu>
Date: Sat May 3 22:39:42 2008 +0200
x86: remove dell reboot dmi quirk board name match
http://bugzilla.kernel.org/show_bug.cgi?id=10547
Newer Dell OptiPlex 745s hang before rebooting after 'sudo reboot'.
A patch for some versions of the OptiPlex was proposed here --
http://lkml.org/lkml/2007/6/5/59 -- and is included in 2.6.23 and
later kernels, according to
http://lxr.linux.no/linux+v2.6.23/arch/i386/kernel/reboot.c . However,
the DMI_BOARD_NAME ("0WF810") is too restrictive. Newer OptiPlex
machines have a DMI_BOARD_NAME of "0RF703". I therefore suggest
adding another clause to reboot.c, similar to the one in the original
patch, but matching a DMI_BOARD_NAME of "0RF703".
On further inspection, it seems that there are other DMI_BOARD_NAMEs
for this same machine. They seem to change from time to time, which
means that the current code is fragile. Moreover, using bios reboot
should not break non-SFF OptiPlex 745s, and so a reasonable fix is to
simply drop the match on DMI_BOARD_NAME.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e37ee42caadab46cec277546099fa2a6207fff0b
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat May 3 22:01:31 2008 +0200
x86: es7000 build fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c5562faeaacf19e81a78ee37cc6b96ab1f3e68e4
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 00:31:37 2008 +0300
x86: make additional_cpus static
This patch makes the needlessly global additional_cpus static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit dbe55f4797712f86691a0ee0b5f508693c7310fe
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 01:50:26 2008 +0300
x86: make start_secondary() static
start_secondary() needlessly became global.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4c6214c75a5aca5417156a47cd890b128c5f0637
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Thu May 1 11:31:07 2008 +0200
kbuild, suspend, x86: fix rebuild of wakeup.bin
In kernel/acpi/realmode/Makefile use the 'always'
variable to say that wakeup.bin should always
be made.
In acpi/Makefile we then do not need to specify the
requested target and we avoid the message from make:
`arch/x86/kernel/acpi/realmode/wakeup.bin' is up to date.
Add wakeup.lds to list af targets to avoid rebuilding
wakeup.bin - from Roland McGrath.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Rafael J. Wysocki <rjw at sisk.pl>
Cc: Pavel Machek <pavel at suse.cz>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 22eecde2f9034764a3fd095eecfa3adfb8ec9a98
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 1 12:06:54 2008 +0200
uml: fix gcc problem
this is what caused gcc 4.3 to throw an internal error when
OPTIMIZE_INLINING was enabled ...
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 48b83d2425d7781bb625b1c37b5f2a8963b6e23b
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Fri May 2 21:24:30 2008 +0200
x86: undo visws/numaq build changes
arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
override the generic pci-y rules. This needs a proper cleanup, but
that needs more thoughts. Undo
commit 895d30935ebe05f192e844792668bf8d19deaae7
x86: numaq fix
do not override the existing pci-y rule when adding visws or
numaq rules.
There is also a stupid init function ordering problem vs. acpi.o
Add comments to the Makefile to avoid tripping over this again.
Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
build.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1024c5f4be4fc5b00337464fb8a442bebf15df68
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun May 4 17:03:41 2008 +0200
ide: IDE_HFLAG_SERIALIZE_DMA bugfix
Patch re-ordering could be harmful:
commit 1fd1890594bd355a4217f5658a34763e77decee3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:24 2008 +0200
ide: add IDE_HFLAG_SERIALIZE_DMA host flag
...
is buggy because ->init_dma method / ide_hwif_setup_dma() is called
before IDE_HFLAG_SERIALIZE_DMA host flag is checked.
Fix it by checking IDE_HFLAG_SERIALIZE[_DMA] after DMA initialization.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 30 12:39:05 2008 -0300
x86: KVM geust: make setup_secondary_clock definition dependent on local apic
Since the pv_apic_ops are only present if CONFIG_X86_LOCAL_APIC is compiled
in, kvmclock failed to build without this option. This patch fixes this.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 93df766322ba1db2801e4b826985a4932dd75866
Author: Avi Kivity <avi at qumranet.com>
Date: Fri May 2 13:23:10 2008 +0300
KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
nonpae guests can call rmap_write_protect twice per page (for page tables)
or four times per page (for page directories), triggering a bogus warning.
Remove the warning.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit bc1a34f1bf354fabc03e3f465620c80e510d0e8f
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Thu May 1 18:43:33 2008 +0200
KVM: avoid fx_init() schedule in atomic
This make sure not to schedule in atomic during fx_init. I also
changed the name of fpu_init to fx_finit to avoid duplicating the name
with fpu_init that is already used in the kernel, this makes grep
simpler if nothing else.
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b4f14abd95cd8d42f08438f1c4ec3eafe41054ee
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date: Wed Apr 30 17:59:04 2008 +0200
KVM: Avoid spurious execeptions after setting registers
Clear pending exceptions when setting new register values. This avoids
spurious exceptions after restoring a vcpu state or after
reset-on-triple-fault.
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ece15babfa514e06118f62f4df2c757d6209f4f0
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Apr 30 13:23:54 2008 -0300
KVM: PIT: support mode 4
The in-kernel PIT emulation ignores pending timers if operating under
mode 4, which for example DragonFlyBSD uses (and Plan9 too, apparently).
Mode 4 seems to be similar to one-shot mode, other than the fact that it
starts counting after the next CLK pulse once programmed, while mode 1
starts counting immediately, so add a FIXME to enhance precision.
Fixes sourceforge bug 1952988.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Acked-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit dc7457ea52f88539dc72925360e6068d5c938a0f
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Apr 30 16:13:36 2008 +0300
KVM: x86 emulator: disable writeback on lmsw
The recent changes allowing memory operands with lmsw and smsw left
lmsw with writeback enabled. Since lmsw has no oridinary destination
operand, the dst pointer was not initialized, resulting in an oops.
Close the hole by disabling writeback for lmsw.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit de368dceb33c3c068dbde1407aff75cd8e126f04
Author: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Date: Tue Apr 29 18:18:23 2008 +0200
KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
This patch adds the delivery of INTERRUPT_FP_UNAVAIL exceptions to the guest.
It's needed if a guest uses ppc binaries using the Floating point instructions.
Signed-off-by: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Acked-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 45c5eb67da5a668abe79c23a7e64dbc87a600f90
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Fri Apr 25 17:55:49 2008 -0500
KVM: ppc: Handle guest idle by emulating MSR[WE] writes
This reduces host CPU usage when the guest is idle. However, the guest must
set MSR[WE] in its idle loop, which Linux did not do until 2.6.26.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Jerone Young <jyoung5 at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3fe913e7c550a869e250d04c34410f7a6e263f7c
Author: Izik Eidus <izike at qumranet.com>
Date: Mon Apr 28 18:23:52 2008 +0300
KVM: x86: task switch: fix wrong bit setting for the busy flag
The busy bit is bit 1 of the type field, not bit 8.
Signed-off-by: Izik Eidus <izike at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1439442c7b257b47a83aea4daed8fbf4a32cdff9
Author: Sheng Yang <sheng.yang at intel.com>
Date: Mon Apr 28 12:24:45 2008 +0800
KVM: VMX: Enable EPT feature for KVM
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b7ebfb0509692cd923e31650f81ed4d79c9a3e59
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:44:52 2008 +0800
KVM: VMX: Prepare an identity page table for EPT in real mode
[aliguory: plug leak]
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 0d15029895051904e31925ec63525cc3a637f7de
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:44:50 2008 +0800
KVM: Export necessary function for EPT
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1ac593c97eb229da44819f66fea47975537c1177
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:44:42 2008 +0800
KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
Currently EPT level is 4 for both pae and x86_64. The patch remove the #ifdef
for alloc root_hpa and free root_hpa to support EPT.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7b52345e2c4c7333bf7eba8034ffc4683fa63c91
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:13:50 2008 +0800
KVM: MMU: Add EPT support
Enable kvm_set_spte() to generate EPT entries.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 67253af52e9133fb4cfbf7a2448a2d3524d1fa6c
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 10:20:22 2008 +0800
KVM: Add kvm_x86_ops get_tdp_level()
The function get_tdp_level() provided the number of tdp level for EPT and
NPT rather than the NPT specific macro.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 649de51b883746d76c5fa1614dd067054c9d702a
Author: Robert Jarzmik <rjarzmik at free.fr>
Date: Fri May 2 21:17:06 2008 +0100
[ARM] 5027/1: Fixed random memory corruption on pxa suspend cycle.
Each time a pxa type cpu went in suspend, a portion of
kmalloc memory was corrupted.
The issue was an incorrect length allocation introduced by
the commit 711be5ccfe9a02ba560aa918a008c31ea4760163 for
the save registers array (=> overflow).
Signed-off-by: Robert Jarzmik <rjarzmik at free.fr>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit c8df9a53e8d16877fc0b268b002af2a47a14643a
Author: Linus Walleij <triad at df.lth.se>
Date: Tue Apr 29 09:34:07 2008 +0100
[ARM] 5024/1: Fix some minor clk issues in the MMCI PL18x driver
This fixes some two minor clk issues.
The first is a comparison where a byte will probably wrap around to 0 instead of being saturated to 255, shouldn't be triggered very often but need fixing.
The second is an attempt by the driver to adjust MCLK down to the maximum frequency according to the spec, so we don't accidentally overclock the PL18x block. None of the mach-{versatile|integrator|lh7a40x} that use it in-tree seem to have a problem with this (all are well below 100MHz, typically 33MHz), but some day there will be a problem.
This is not applied on top of the earlier mmci patch for race condition but rather a clean 2.6.25, but I guess it applies without major protests anyway.
Signed-off-by: Linus Walleij <triad at df.lth.se>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit f8b6389bd53361a19ec5236e298527c9c905ca4d
Author: Ryan Mallon <ryan at bluewatersys.com>
Date: Mon Apr 28 23:35:47 2008 +0100
[ARM] 5023/1: Fix broken gpio interrupts on ep93xx
Change gpio_direction_output to gpio_direction_input in
ep93xx_gpio_irq_type. Fixes broken gpio interrupts.
Signed-off-by: Ryan Mallon <ryan at bluewatersys.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 8c6d6adc6b87daa364ee9deb2e966021d37a7622
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 10:17:08 2008 +0800
KVM: MMU: Move some definitions to a header file
Move some definitions to mmu.h in order to allow building common table
entries between EPT and non-EPT.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d56f546db97795dca5aa575b00b0e9886895ac87
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 10:13:16 2008 +0800
KVM: VMX: EPT Feature Detection
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit be0c007ac64f880a946995d6d1fc654acc81484d
Author: David S. Miller <davem at davemloft.net>
Date: Sun May 4 01:34:31 2008 -0700
niu: Fix probing regression for maramba on-board chips.
Changeset 7f7c4072ea552f97a0898331322f71986a97299c ("niu: Determine
the # of ports from the card's VPD data") caused maramba on-board
NIU ports to stop probing properly.
The old code had a fallback that would use a num_ports value of
4 if all the probing methods failed, but that was removed.
This restores the fallback of 4 ports, to get things working
again.
Bump driver version and release date.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ac551828993eecb8499ef9cc3c828fceb49bcf7a
Author: Jean Delvare <khali at linux-fr.org>
Date: Fri May 2 20:37:21 2008 +0200
modpost: i2c aliases need no trailing wildcard
Not all device types need a wildcard at the end of their module
aliases. In particular, for i2c module aliases, the trailing wildcard
is not only unneeded, it could also cause the wrong driver to be
loaded.
As I2C devices have no IDs, i2c module aliases are simple, arbitrary
device names. For example:
$ /sbin/modinfo lm90
filename: /lib/modules/2.6.25-git18/kernel/drivers/hwmon/lm90.ko
author: Jean Delvare <khali at linux-fr.org>
description: LM90/ADM1032 driver
license: GPL
vermagic: 2.6.25-git18 mod_unload
depends: hwmon
alias: i2c:lm90*
alias: i2c:adm1032*
alias: i2c:lm99*
alias: i2c:lm86*
alias: i2c:max6657*
alias: i2c:adt7461*
alias: i2c:max6680*
$
This would cause trouble if one I2C chip name matches the beginning of
another I2C chip name and both chips are supported by different
drivers. For example, an i2c device named lm9042 would cause the lm90
driver to be loaded, while it doesn't support that device. This case
has yet to be seen in practice, but still, I'd like to fix it now. The
cleanest fix is to remove the trailing wildcard from i2c module aliases.
Here's a patch doing this.
Not all device type aliases need a trailing wildcard, in particular
the i2c aliases don't. Don't add a wildcard by default in do_table(),
instead let each device type handler add it if needed.
I have tested types acpi, dmi, eisa, i2c, ide, ieee1394, input, pci,
pcmcia, platform, pnp, scsi, serio, ssb and usb. Other types (ccw, of,
vio, parisc, sdio and virtio) are untested.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Jochen Friedrich <jochen at scram.de>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 59f7137a1369c25308672def38f3b126d0c7575a
Author: Robert Reif <reif at earthlink.net>
Date: Sat May 3 21:12:00 2008 -0700
sparc video: make blank use proper constant
Make blank functions use proper constant for unblanking.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e544ff00da4b53069dbca3debbfb02d455f72467
Author: David S. Miller <davem at davemloft.net>
Date: Sat May 3 21:10:58 2008 -0700
lapbeth: Release ->ethdev when unregistering device.
Otherwise it leaks forever.
Based upon a report by Roland <devzero at web.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 41fef0ee7b8f3fe3f3dd2ddc9b170f3d88bce595
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Sat May 3 21:03:01 2008 -0700
xfrm: convert empty xfrm_audit_* macros to functions
it removes these warnings when CONFIG_AUDITSYSCALL is unset:
net/xfrm/xfrm_user.c: In function 'xfrm_add_sa':
net/xfrm/xfrm_user.c:412: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:411: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:410: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_del_sa':
net/xfrm/xfrm_user.c:485: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:484: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:483: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_policy':
net/xfrm/xfrm_user.c:1132: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1131: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1130: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_get_policy':
net/xfrm/xfrm_user.c:1382: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1381: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1380: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_pol_expire':
net/xfrm/xfrm_user.c:1620: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1619: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1618: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_sa_expire':
net/xfrm/xfrm_user.c:1658: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1657: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1656: warning: unused variable 'loginuid'
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 81d6ec6b36bdf30e283ab98e7646571484401dbb
Author: David S. Miller <davem at davemloft.net>
Date: Sat May 3 21:00:55 2008 -0700
Revert "[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit()."
This reverts commit 2664ef44cf5053d2b7dff01cecac70bc601a5f68.
Ingo moved around where the softlockup dependency sits
so this change is no longer necessary.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c8005785102e5b67ecf213f06a3d6c001f6f8cb4
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Sat May 3 20:56:42 2008 -0700
net: Fix useless comment reference loop.
include/linux/skbuff.h says:
/* These elements must be at the end, see alloc_skb() for details. */
net/core/skbuff.c says:
* See comment in sk_buff definition, just before the 'tail' member
This patch contains my guess as to the actual reason rather than a
dead comment reference loop.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5b81d689e57a85b1ff60edfb65e5b8a12d28ecee
Author: Robert Reif <reif at earthlink.net>
Date: Sat May 3 20:55:27 2008 -0700
sparc: tcx.c remove unnecessary function
From: Robert Reif <reif at earthlink.net>
Replaced tcx_init_one with tcx_probe.
Fixed some checkpatch problems.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3ba08b00e0d8413d79be9cab8ec085ceb6ae6fd6
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date: Sat May 3 20:46:29 2008 -0700
sch_htb: remove from event queue in htb_parent_to_leaf()
There is lack of removing a class from the event queue while changing
from parent to leaf which can cause corruption of this rb tree. This
patch fixes a bug introduced by my patch: "sch_htb: turn intermediate
classes into leaves" commit: 160d5e10f87b1dc88fd9b84b31b1718e0fd76398.
Many thanks to Jan 'yanek' Bortl for finding a way to reproduce this
rare bug and narrowing the test case, which made possible proper
diagnosing.
This patch is recommended for all kernels starting from 2.6.20.
Reported-and-tested-by: Jan 'yanek' Bortl <yanek at ya.bofh.cz>
Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit afa26be86b65a7183ceac29bdf1f51d6fc6932f0
Merge: 269f21344b23e552c21c9e2d7ca258479dcd7a0a 4f95f81a48623982879f4fa80c641933444afd18
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 13:51:10 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
clocksource: allow read access to available/current_clocksource
clocksource: Fix permissions for available_clocksource
hrtimer: remove duplicate helper function
commit 269f21344b23e552c21c9e2d7ca258479dcd7a0a
Author: Ulrich Drepper <drepper at redhat.com>
Date: Sat May 3 15:28:45 2008 -0400
tiny mq_open optimization
A very small cleanup for mq_open.
We do not have to call set_close_on_exit if we create the file
descriptor right away with the flag set. We have a function for this
now. The resulting code is smaller and a tiny bit faster.
Signed-off-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d35c7b0e54a596c5a8134d75999b7f391a9c6550
Author: Ulrich Drepper <drepper at redhat.com>
Date: Sat May 3 15:10:37 2008 -0400
unified (weak) sys_pipe implementation
This replaces the duplicated arch-specific versions of "sys_pipe()" with
one unified implementation. This removes almost 250 lines of duplicated
code.
It's marked __weak, so that *if* an architecture wants to override the
default implementation it can do so by simply having its own replacement
version, since many architectures use alternate calling conventions for
the 'pipe()' system call for legacy reasons (ie traditional UNIX
implementations often return the two file descriptors in registers)
I still haven't changed the cris version even though Linus says the BKL
isn't needed. The arch maintainer can easily do it if there are really
no obstacles.
Signed-off-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4f95f81a48623982879f4fa80c641933444afd18
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Sat May 3 14:23:14 2008 +0200
clocksource: allow read access to available/current_clocksource
There is no harm, when users can read the info and we ask often enough
during debugging for this kind of information.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: John Stultz <johnstul at us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4359a023a8c3b247b348c310bf510b23f3c1ab64
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri May 2 12:49:40 2008 +0200
clocksource: Fix permissions for available_clocksource
File permissions for
/sys/devices/system/clocksource/clocksource0/available_clocksource
are 600 which allows write access. But this is in fact a read only
file. So change permissions to 400.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: John Stultz <johnstul at us.ibm.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4346f65426cbceb64794b468e4af6f5632d58c5e
Author: Oliver Hartkopp <oliver at hartkopp.net>
Date: Wed Apr 30 23:04:37 2008 +0200
hrtimer: remove duplicate helper function
The helper function hrtimer_callback_running() is used in
kernel/hrtimer.c as well as in the updated net/can/bcm.c which now
supports hrtimers. Moving the helper function to hrtimer.h removes the
duplicate definition in the C-files.
Signed-off-by: Oliver Hartkopp <oliver at hartkopp.net>
Cc: David Miller <davem at davemloft.net>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5ade9deaaa3e1f7291467d97b238648e43eae15e
Author: Steve French <sfrench at us.ibm.com>
Date: Fri May 2 20:56:23 2008 +0000
[CIFS] fix typo
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 77a8d5741f3ee2c79554382179cca7b5893d6ae9
Author: Steve Wise <swise at opengridcomputing.com>
Date: Fri May 2 10:57:09 2008 -0700
RDMA/cxgb3: Bump up the MPA connection setup timeout.
Testing on large clusters shows its way too short at 10 secs.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit c4d49776e8f5bf2d900d2b6d4855c1670a535ac5
Author: Steve Wise <swise at opengridcomputing.com>
Date: Fri May 2 10:57:09 2008 -0700
RDMA/cxgb3: Silently ignore close reply after abort.
Remove bad BUG_ON() that can trigger in correct operation from
close_con_rpl(). It is possible to get a close_rpl message on a dead
connection. The sequence is:
- host refs ep for close exchange
- host posts close_req
- hw posts PEER_ABORT from incoming RST
- host marks ep DEAD
- host posts ABORT_RPL and releases ep resources
- hw posts CLOSE_RPL
- host derefs ep and ep freed.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit c8286944b802c5ce4063ec3c334b38c6757a9434
Author: Steve Wise <swise at opengridcomputing.com>
Date: Fri May 2 11:17:41 2008 -0500
RDMA/cxgb3: QP flush fixes
- Flush the QP only after the HW disables the connection. Currently
we flush the QP when transitioning to CLOSING. This exposes a race
condition where the HW can complete a RECV WR, for instance, -and-
the SW can flush that same WR.
- Only call CQ event handlers on flush IFF we actually flushed something.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 57ce41d1d18279cc90223f3deadca70c7de1cfca
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date: Wed Apr 30 20:02:45 2008 -0700
IB/ipoib: Fix transmit queue stalling forever
Commit f56bcd80 ("IPoIB: Use separate CQ for UD send completions")
introduced a bug where the transmit queue could get stopped and never
woken up. The problem is that send completions are only polled at the
end of the xmit function, so if the send queue fills up and the xmit
path stops the queue, then there is no way for send completions to
ever get polled, and so the transmit queue stays stopped forever.
Fix this by arming the send CQ just before posting the last send
request that fills the send queue. Then, when the completion event
handler is called, drain the send CQ. Since it is possible that not
enough send completions are in the CQ, verify that the the net queue
has been woken up after draining the send CQ, and if not arm a timer
and drain again at the timer function.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 3ae15e1623b9d32eb410c2a23d90e47b16e6acd0
Author: Roland Dreier <rolandd at cisco.com>
Date: Wed Apr 30 19:52:55 2008 -0700
IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
When I merged bbf8eed1 ("IB/mlx4: Add support for resizing CQs") I
changed things around so that mlx4_ib_alloc_cq_buf() and
mlx4_ib_free_cq_buf() were used everywhere they could be. However, I
screwed up the number of entries passed into mlx4_ib_alloc_cq_buf()
in a couple places -- the function bumps the number of entries
internally, so the caller shouldn't add 1 as well.
Passing a too-big value for the number of entries to mlx4_ib_free_cq_buf()
can cause the cleanup to go off the end of an array and corrupt
allocator state in interesting ways.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 70b9f7dc1435412ca2b89b13a8353bd9915a7189
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Mon Apr 28 16:27:23 2008 -0700
x86/pci: remove flag in pci_cfg_space_size_ext
so let pci_cfg_space_size call it directly without flag.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 98db6f193c93e9b4729215af2c9101210e11d26c
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 22:38:48 2008 +0200
x86: fix section mismatch in pci_scan_bus
Fix following section mismatch warning:
WARNING: vmlinux.o(.text+0x275616): Section mismatch in reference from the function pci_scan_bus() to the function .devinit.text:pci_scan_bus_parented()
The warning was seen with a CONFIG_DEBUG_SECTION_MISMATCH=y build.
The inline function pci_scan_bus refer to functions annotated
__devinit - so annotate it __devinit too.
This revealed a few x86 specific functions that were only
used from __init or __devinit context.
So annotate these __devinit and the warning was killed.
The added include in pci.h was not strictly required but
added to avoid being dependent on indirect includes.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>
commit 9b1ec9eceabe0c90d12116871f692263b69d476d
Author: Steve French <sfrench at us.ibm.com>
Date: Tue Apr 29 20:15:43 2008 +0000
[CIFS] Remove duplicate call to mode_to_acl
The current logic in cifs_setattr calls mode_to_acl twice on mode
changes if cifsacl is enabled. Remove the duplicate call.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
CC: Shirish Pargaonkar <shirishp at us.ibm.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit ce4e2e4558903ef92edf1ab4e09b0b338a09fd61
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:29:59 2008 +0200
mv643xx_eth: inter-mv643xx SMI port sharing
There exist chips with up to four mv643xx_eth silicon blocks but
only one external SMI (MII management) interface -- the SMI logic
of the first block is shared by all the blocks.
Handle this by allowing a per-port override of which
mv643xx_eth_shared's SMI registers (and spinlock) to use.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Acked-by: Nicolas Pitre <nico at marvell.com>
Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
commit 240e4419e0cfcba737883b637ec2bdcc071ea03d
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:27:44 2008 +0200
mv643xx_eth: shorten shared platform driver name
Change the MV643XX_ETH_SHARED_NAME platform driver name to something
shorter than 19 characters, so that we can register multiple (otherwise
we end up with sysfs conflicts since all instances will map to
"mv643xx_eth_shared." as there is a 20-char sysfs file name limit.)
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Acked-by: Nicolas Pitre <nico at marvell.com>
Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
commit c416a41f99be190e1f558cb06f70ddd560ce8b4b
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:27:32 2008 +0200
mv643xx_eth: configurable t_clk
Make t_clk configurable via platform device data (with the current
hardcoded value, 133 MHz, being the default), as it varies across
different chip families.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Acked-by: Nicolas Pitre <nico at marvell.com>
Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
commit f2ce825d2a89b30af14fa577298fecaab7bc9504
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:27:17 2008 +0200
mv643xx_eth: mbus decode window support
Make it possible to pass mbus_dram_target_info to the mv643xx_eth
driver via the platform data, and make the mv643xx_eth driver
program the window registers based on this data if it is passed in.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi at marvell.com>
Acked-by: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
commit fa3959f457109cc7d082b86ea6daae927982815b
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:27:02 2008 +0200
mv643xx_eth: get rid of static variables, allow multiple instances
Move mv643xx_eth's static state (ethernet register block base address
and MII management interface spinlock) into a struct hanging off the
shared platform device. This is necessary to support chips that
contain multiple mv643xx_eth silicon blocks.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Acked-by: Nicolas Pitre <nico at marvell.com>
Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
commit 4b18f2a9c3964f7612b7403dddc1d1ba5443ae24
Author: Steve French <sfrench at us.ibm.com>
Date: Tue Apr 29 00:06:05 2008 +0000
[CIFS] convert usage of implicit booleans to bool
Signed-off-by: Joe Perches <joe at perches.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit e9f20d6f03e8df393b001dab6dc5226c2a5daf57
Merge: bf62fd887cab230f5952b611bde25e8e15acb454 e31a94ed371c70855eb30b77c490d6d85dd4da26
Author: Igor Mammedov <niallain at gmail.com>
Date: Mon Apr 28 23:08:21 2008 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
commit bf62fd887cab230f5952b611bde25e8e15acb454
Author: Igor Mammedov <niallain at gmail.com>
Date: Mon Apr 28 23:05:58 2008 +0000
[CIFS] fixed compatibility issue with samba refferal request
treeName part is canonicalized to '/' path separator
Signed-off-by: Igor Mammedov <niallain at gmail.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 22ba0317c81ba263172baaefd2cb38de78c4598f
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 18:38:49 2008 +0300
udf: fs/udf/partition.c:udf_get_pblock() mustn't be inline
This patch fixes the following build error with UML and gcc 4.3:
<-- snip -->
...
CC fs/udf/partition.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/udf/partition.c: In function ‘udf_get_pblock_virt15’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/udf/partition.c:32: sorry, unimplemented: inlining failed in call to ‘udf_get_pblock’: function body not available
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/udf/partition.c:102: sorry, unimplemented: called from here
make[3]: *** [fs/udf/partition.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jan Kara <jack at suse.cz>
commit 39da9847113a870b20fee9a7c216a848b9a5e9f7
Author: Steve French <sfrench at us.ibm.com>
Date: Mon Apr 28 04:04:34 2008 +0000
[CIFS] Fix statfs formatting
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 1dbbb6077426f8ce63d6a59c5ac6613e1689cbde
Merge: d09e860cf07e7c9ee12920a09f5080e30a12a23a 064922a805ec7aadfafdd27aa6b4908d737c3c1d
Author: Steve French <sfrench at us.ibm.com>
Date: Mon Apr 28 04:01:34 2008 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
commit d09e860cf07e7c9ee12920a09f5080e30a12a23a
Author: Steve French <sfrench at us.ibm.com>
Date: Sat Apr 26 00:22:23 2008 +0000
[CIFS] Adds to dns_resolver checking if the server name is an IP addr and skipping upcall in this case.
Signed-off-by: Igor Mammedov <niallain at gmail.com>
Signed-off-by: sfrench at us.ibm.com
commit 404e86e1550cc2c84bb57a372af784585c732f9a
Merge: 0206e61b467fde4d7b50f1a64355182a4fd9576b b9fa38f75ea7e1f64bc29653ca9758303ce698e4
Author: Steve French <sfrench at us.ibm.com>
Date: Fri Apr 25 20:20:10 2008 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
commit 0206e61b467fde4d7b50f1a64355182a4fd9576b
Author: Steve French <sfrench at us.ibm.com>
Date: Fri Apr 25 18:19:40 2008 +0000
[CIFS] Fix spelling mistake
Noticed by Joe Perches
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 21f20b69a567ca8971fe643d2ebe5d680c9b43af
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Fri Apr 25 15:24:59 2008 +0200
ns9xxx: fix sparse warning
The actual warning is
arch/arm/mach-ns9xxx/irq.c:65:6: warning: symbol 'handle_prio_irq' was not declared. Should it be static?
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
commit a57a0b1d0f66da5ff5dc8f1a5a999f4d2f66090a
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Fri Apr 25 15:16:17 2008 +0200
ns9xxx: check for irq lockups
When I copy-adapted handle_level_irq I skipped note_interrupt because
I considered it unimportant. If I had understand its importance I would
have saved myself some ours of debugging.
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
commit a13c81952444d032ad3b5b7027b330150dbe2408
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Fri Apr 25 15:03:18 2008 +0200
ns9xxx: fix handle_prio_irq to unmask irqs with lower priority
When an irq is reported all lower prio irqs are masked until the current
irq is acked. So never leave handle_prio_irq without acking.
desc->status & IRQ_INPROGRESS should never become true because the current
irq is masked until it is acked, too.
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
commit 47df1793171771ff9b1622d30433ef6edf0eb280
Author: Steve French <sfrench at us.ibm.com>
Date: Fri Apr 25 02:01:44 2008 +0000
[CIFS] Update cifs version number
Signed-off-by: Steve French <sfrench at us.ibm.com>
-----------------------------------------------------------------------
Summary of changes:
Documentation/DocBook/kgdb.tmpl | 8 +-
Documentation/filesystems/Locking | 2 -
Documentation/filesystems/vfs.txt | 4 -
Documentation/i2c/functionality | 95 ++--
Documentation/i2c/smbus-protocol | 81 ++-
Documentation/kbuild/kconfig-language.txt | 24 -
Documentation/kernel-parameters.txt | 5 +-
Documentation/s390/CommonIO | 11 -
Documentation/scheduler/sched-design.txt | 165 -----
MAINTAINERS | 6 +-
Makefile | 2 +-
arch/arm/kernel/sys_arm.c | 17 -
arch/arm/mach-ep93xx/core.c | 2 +-
arch/arm/mach-ns9xxx/irq.c | 22 +-
arch/arm/mach-orion5x/addr-map.c | 66 +--
arch/arm/mach-orion5x/common.c | 11 +-
arch/arm/mach-orion5x/common.h | 1 -
arch/arm/mach-pxa/Makefile | 12 +-
arch/arm/mach-pxa/corgi.c | 4 -
arch/arm/mach-pxa/cpu-pxa.c | 310 ++++++---
arch/arm/mach-pxa/lubbock.c | 2 +-
arch/arm/mach-pxa/pm.c | 10 +-
arch/arm/mach-pxa/poodle.c | 2 -
arch/arm/mach-pxa/pxa25x.c | 11 +-
arch/arm/mach-pxa/pxa27x.c | 11 +-
arch/arm/mach-pxa/pxa3xx.c | 7 +-
arch/arm/mach-pxa/spitz.c | 2 -
arch/arm/mach-pxa/spitz_pm.c | 3 -
arch/arm/mach-pxa/tosa.c | 2 -
arch/arm/mach-sa1100/pm.c | 8 +-
arch/arm/plat-s3c24xx/clock.c | 4 +-
arch/avr32/kernel/sys_avr32.c | 13 -
arch/blackfin/Kconfig | 18 +-
arch/blackfin/kernel/asm-offsets.c | 3 -
arch/blackfin/kernel/fixed_code.S | 2 +-
arch/blackfin/kernel/module.c | 37 +-
arch/blackfin/kernel/process.c | 2 +-
arch/blackfin/kernel/ptrace.c | 4 +-
arch/blackfin/kernel/signal.c | 13 +
arch/blackfin/kernel/sys_bfin.c | 17 -
arch/blackfin/kernel/time-ts.c | 10 +-
arch/blackfin/mach-bf527/boards/ezkit.c | 104 +++-
arch/blackfin/mach-bf533/boards/cm_bf533.c | 33 +
arch/blackfin/mach-bf533/boards/ezkit.c | 31 +
arch/blackfin/mach-bf533/boards/stamp.c | 31 +
arch/blackfin/mach-bf537/boards/cm_bf537.c | 33 +
arch/blackfin/mach-bf537/boards/stamp.c | 31 +
arch/blackfin/mach-bf548/boards/cm_bf548.c | 34 +
arch/blackfin/mach-bf548/boards/ezkit.c | 32 +
arch/blackfin/mach-bf561/boards/cm_bf561.c | 32 +
arch/blackfin/mach-bf561/boards/ezkit.c | 31 +
arch/blackfin/mach-common/Makefile | 5 +-
arch/blackfin/mach-common/cpufreq.c | 26 +-
arch/blackfin/mach-common/dpmc.c | 137 ++++
arch/blackfin/mach-common/{dpmc.S => dpmc_modes.S} | 27 +-
arch/blackfin/mach-common/entry.S | 113 +++-
arch/cris/kernel/sys_cris.c | 19 -
arch/frv/kernel/sys_frv.c | 17 -
arch/h8300/kernel/sys_h8300.c | 17 -
arch/m32r/kernel/sys_m32r.c | 20 -
arch/m68k/kernel/sys_m68k.c | 17 -
arch/m68k/kernel/traps.c | 17 +-
arch/m68k/mac/config.c | 24 -
arch/m68knommu/kernel/sys_m68k.c | 17 -
arch/mn10300/Kconfig | 11 -
arch/mn10300/kernel/sys_mn10300.c | 17 -
arch/parisc/kernel/sys_parisc.c | 13 -
arch/powerpc/boot/dts/sequoia.dts | 9 +-
arch/powerpc/kernel/btext.c | 1 -
arch/powerpc/kernel/cputable.c | 53 ++-
arch/powerpc/kernel/head_44x.S | 9 +-
arch/powerpc/kernel/head_64.S | 4 -
arch/powerpc/kernel/isa-bridge.c | 3 -
arch/powerpc/kernel/setup_64.c | 10 +-
arch/powerpc/kernel/syscalls.c | 17 -
arch/powerpc/kvm/booke_guest.c | 6 +
arch/powerpc/kvm/powerpc.c | 20 +-
arch/powerpc/lib/Makefile | 1 +
arch/powerpc/lib/devres.c | 42 ++
arch/powerpc/platforms/cell/interrupt.c | 53 ++-
arch/powerpc/platforms/cell/spu_base.c | 31 +-
arch/powerpc/platforms/cell/spu_priv1_mmio.c | 16 +-
arch/powerpc/platforms/cell/spufs/fault.c | 17 +-
arch/powerpc/platforms/cell/spufs/inode.c | 10 +-
arch/powerpc/platforms/cell/spufs/run.c | 38 +-
arch/powerpc/platforms/cell/spufs/sched.c | 7 +-
arch/powerpc/platforms/cell/spufs/spufs.h | 3 +-
arch/powerpc/platforms/cell/spufs/switch.c | 71 ++-
arch/powerpc/platforms/chrp/pegasos_eth.c | 4 +
arch/powerpc/platforms/pseries/scanlog.c | 19 +-
arch/powerpc/sysdev/mv64x60_dev.c | 2 +
arch/powerpc/sysdev/ppc4xx_pci.c | 180 ++++--
arch/powerpc/xmon/xmon.c | 6 +-
arch/ppc/syslib/mv64x60.c | 3 +
arch/s390/Kconfig | 7 +
arch/s390/kernel/compat_wrapper.S | 2 +-
arch/s390/kernel/entry.S | 29 +-
arch/s390/kernel/entry64.S | 57 ++-
arch/s390/kernel/ptrace.c | 100 +---
arch/s390/kernel/sys_s390.c | 17 -
arch/s390/kvm/Kconfig | 1 -
arch/s390/kvm/intercept.c | 3 +
arch/s390/kvm/kvm-s390.c | 5 +-
arch/s390/mm/Makefile | 1 +
arch/s390/mm/init.c | 3 +
arch/s390/mm/page-states.c | 79 +++
arch/sh/Kconfig | 17 +-
arch/sh/Kconfig.debug | 1 +
arch/sh/Makefile | 1 -
arch/sh/boards/mpc1211/Makefile | 8 -
arch/sh/boards/mpc1211/pci.c | 295 ---------
arch/sh/boards/mpc1211/rtc.c | 136 ----
arch/sh/boards/mpc1211/setup.c | 347 ----------
arch/sh/boards/renesas/migor/setup.c | 11 +-
arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 2 +-
arch/sh/boards/renesas/r7780rp/irq-r7780rp.c | 2 +-
arch/sh/boards/renesas/r7780rp/irq-r7785rp.c | 2 +-
arch/sh/boards/renesas/r7780rp/setup.c | 24 +-
arch/sh/boards/renesas/rts7751r2d/setup.c | 7 +-
arch/sh/boards/se/7206/setup.c | 17 +-
arch/sh/boards/se/7722/setup.c | 6 +
arch/sh/boot/compressed/Makefile_32 | 1 -
arch/sh/boot/compressed/Makefile_64 | 1 -
arch/sh/kernel/cpu/irq/intc-sh5.c | 73 ++-
arch/sh/kernel/cpu/irq/intc.c | 93 +++-
arch/sh/kernel/cpu/sh2a/fpu.c | 4 +-
arch/sh/kernel/cpu/sh3/Makefile | 2 +-
arch/sh/kernel/cpu/sh3/setup-sh3.c | 71 ++
arch/sh/kernel/cpu/sh3/setup-sh7705.c | 22 +-
arch/sh/kernel/cpu/sh3/setup-sh770x.c | 32 +-
arch/sh/kernel/cpu/sh3/setup-sh7710.c | 25 +-
arch/sh/kernel/cpu/sh3/setup-sh7720.c | 35 +-
arch/sh/kernel/cpu/sh5/entry.S | 28 +
arch/sh/kernel/cpu/sh5/probe.c | 4 +
arch/sh/kernel/early_printk.c | 30 +-
arch/sh/kernel/setup.c | 46 ++-
arch/sh/kernel/sh_ksyms_32.c | 2 -
arch/sh/kernel/sh_ksyms_64.c | 26 +
arch/sh/kernel/sys_sh64.c | 17 -
arch/sh/kernel/time_64.c | 5 +-
arch/sh/lib64/dbg.c | 2 +-
arch/sh/mm/Makefile_64 | 7 +-
arch/sh/mm/cache-sh5.c | 2 +
arch/sh/mm/ioremap_64.c | 2 +
arch/sh/mm/numa.c | 2 +-
arch/sh/tools/mach-types | 1 -
arch/sparc/kernel/entry.S | 2 +
arch/sparc/kernel/process.c | 25 +-
arch/sparc/kernel/ptrace.c | 6 +-
arch/sparc/kernel/rtrap.S | 11 +-
arch/sparc/kernel/signal.c | 84 ++--
arch/sparc/kernel/sys_sparc.c | 3 +-
arch/sparc64/kernel/etrap.S | 7 +-
arch/sparc64/kernel/process.c | 18 +-
arch/sparc64/kernel/ptrace.c | 16 +-
arch/sparc64/kernel/rtrap.S | 1 +
arch/sparc64/kernel/signal.c | 81 ++--
arch/sparc64/kernel/signal32.c | 44 +-
arch/sparc64/kernel/smp.c | 27 +-
arch/sparc64/kernel/sys_sparc.c | 4 +-
arch/sparc64/kernel/sys_sparc32.c | 31 -
arch/sparc64/kernel/systbls.S | 2 +-
arch/sparc64/mm/init.c | 16 +-
arch/um/drivers/line.c | 4 +-
arch/um/include/line.h | 2 +-
arch/um/kernel/syscall.c | 17 -
arch/v850/kernel/syscalls.c | 17 -
arch/x86/Kconfig | 2 +
arch/x86/boot/compressed/relocs.c | 2 +-
arch/x86/kernel/Makefile | 4 +-
arch/x86/kernel/acpi/Makefile | 2 +-
arch/x86/kernel/acpi/realmode/Makefile | 5 +-
arch/x86/kernel/cpu/addon_cpuid_features.c | 21 +
arch/x86/kernel/cpu/common.c | 27 +-
arch/x86/kernel/geode_32.c | 19 +
arch/x86/kernel/i387.c | 12 +-
arch/x86/kernel/kvmclock.c | 4 +
arch/x86/kernel/mpparse.c | 7 +-
arch/x86/kernel/reboot.c | 1 -
arch/x86/kernel/setup_32.c | 7 +-
arch/x86/kernel/setup_64.c | 13 +-
arch/x86/kernel/smpboot.c | 4 +-
arch/x86/kernel/sys_i386_32.c | 17 -
arch/x86/kernel/sys_x86_64.c | 17 -
arch/x86/kvm/i8254.c | 2 +
arch/x86/kvm/mmu.c | 89 +--
arch/x86/kvm/mmu.h | 37 +-
arch/x86/kvm/svm.c | 10 +
arch/x86/kvm/vmx.c | 375 ++++++++++-
arch/x86/kvm/vmx.h | 38 ++
arch/x86/kvm/x86.c | 22 +-
arch/x86/kvm/x86_emulate.c | 1 +
arch/x86/mm/discontig_32.c | 26 -
arch/x86/mm/pat.c | 50 +-
arch/x86/mm/pgtable_32.c | 7 -
arch/x86/pci/Makefile_32 | 12 +-
arch/x86/pci/acpi.c | 41 --
arch/x86/pci/common.c | 69 ++-
arch/x86/pci/fixup.c | 2 +-
arch/x86/pci/init.c | 4 +
arch/x86/pci/k8-bus_64.c | 8 -
arch/x86/pci/pci.h | 3 +
arch/x86/vdso/vdso32-setup.c | 2 +-
arch/x86/video/fbdev.c | 2 +-
block/blk-core.c | 26 +-
block/blk-ioc.c | 2 +-
block/blk-merge.c | 12 +-
block/blk-sysfs.c | 6 +-
block/blk-tag.c | 9 +-
block/cfq-iosched.c | 23 +-
crypto/hmac.c | 25 +-
drivers/accessibility/Kconfig | 12 +-
drivers/ata/Kconfig | 13 +-
drivers/ata/Makefile | 1 +
drivers/ata/ahci.c | 4 +-
drivers/ata/ata_generic.c | 6 +
drivers/ata/ata_piix.c | 25 +
drivers/ata/libata-core.c | 1 +
drivers/ata/libata-eh.c | 2 +-
drivers/ata/libata-sff.c | 6 +-
drivers/ata/pata_acpi.c | 6 +
drivers/ata/pata_sch.c | 206 ++++++
drivers/ata/sata_inic162x.c | 646 ++++++++++++-------
drivers/ata/sata_mv.c | 690 +++++++++++++++-----
drivers/base/sys.c | 3 +-
drivers/block/aoe/aoecmd.c | 10 +-
drivers/char/serial167.c | 2 +-
drivers/char/sx.c | 9 +-
drivers/char/vt.c | 6 +
drivers/edac/edac_core.h | 2 +-
drivers/edac/edac_device.c | 6 +-
drivers/edac/edac_mc.c | 6 +-
drivers/edac/edac_pci.c | 6 +-
drivers/i2c/busses/i2c-mpc.c | 16 +-
drivers/i2c/busses/i2c-piix4.c | 47 ++-
drivers/i2c/busses/i2c-sibyte.c | 6 +-
drivers/i2c/i2c-core.c | 14 +-
drivers/ide/ide-probe.c | 12 +-
drivers/ide/legacy/falconide.c | 2 +-
drivers/infiniband/hw/cxgb3/cxio_hal.c | 103 ++--
drivers/infiniband/hw/cxgb3/cxio_hal.h | 12 +-
drivers/infiniband/hw/cxgb3/cxio_resource.c | 36 +-
drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 +-
drivers/infiniband/hw/cxgb3/iwch_mem.c | 75 ++-
drivers/infiniband/hw/cxgb3/iwch_provider.c | 68 ++-
drivers/infiniband/hw/cxgb3/iwch_provider.h | 8 +-
drivers/infiniband/hw/cxgb3/iwch_qp.c | 13 +-
drivers/infiniband/hw/ehca/ehca_classes.h | 2 +
drivers/infiniband/hw/ehca/ehca_hca.c | 7 +-
drivers/infiniband/hw/ehca/ehca_irq.c | 4 +
drivers/infiniband/hw/ehca/ehca_qp.c | 5 +
drivers/infiniband/hw/ipath/ipath_driver.c | 138 ++++-
drivers/infiniband/hw/ipath/ipath_file_ops.c | 72 +--
drivers/infiniband/hw/ipath/ipath_iba7220.c | 26 +-
drivers/infiniband/hw/ipath/ipath_init_chip.c | 95 ++--
drivers/infiniband/hw/ipath/ipath_intr.c | 80 +--
drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +-
drivers/infiniband/hw/ipath/ipath_rc.c | 6 +-
drivers/infiniband/hw/ipath/ipath_ruc.c | 7 +-
drivers/infiniband/hw/ipath/ipath_sdma.c | 44 +-
drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +-
drivers/infiniband/hw/mlx4/cq.c | 4 +-
drivers/infiniband/ulp/ipoib/ipoib.h | 2 +
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 47 ++-
drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +-
drivers/input/misc/Kconfig | 2 +-
drivers/input/serio/hp_sdc.c | 1 +
drivers/input/serio/i8042-io.h | 2 +-
drivers/macintosh/adb.c | 30 +-
drivers/macintosh/therm_pm72.c | 31 +-
drivers/macintosh/windfarm_smu_sat.c | 10 +-
drivers/md/raid10.c | 2 +-
drivers/media/Makefile | 2 +
drivers/media/video/cx18/cx18-driver.c | 2 +-
drivers/media/video/saa7134/saa7134-video.c | 2 +-
drivers/media/video/tcm825x.c | 7 +
drivers/media/video/tlv320aic23b.c | 6 +
drivers/media/video/tvaudio.c | 13 +-
drivers/misc/kgdbts.c | 75 ++-
drivers/mmc/host/mmci.c | 14 +-
drivers/mtd/maps/Kconfig | 9 +-
drivers/mtd/maps/Makefile | 1 -
drivers/mtd/maps/mpc1211.c | 80 ---
drivers/net/3c59x.c | 73 +-
drivers/net/Kconfig | 14 -
drivers/net/appletalk/cops.c | 16 +-
drivers/net/bonding/bond_main.c | 24 +-
drivers/net/bonding/bond_sysfs.c | 16 +-
drivers/net/cxgb3/cxgb3_main.c | 4 +-
drivers/net/e1000e/defines.h | 10 +
drivers/net/e1000e/e1000.h | 7 +-
drivers/net/e1000e/ethtool.c | 45 +-
drivers/net/e1000e/hw.h | 22 +
drivers/net/e1000e/ich8lan.c | 83 +++-
drivers/net/e1000e/netdev.c | 330 +++++++++-
drivers/net/e1000e/phy.c | 278 ++++++++
drivers/net/eexpress.c | 11 +-
drivers/net/fs_enet/mii-fec.c | 3 +-
drivers/net/gianfar.c | 5 +-
drivers/net/gianfar.h | 3 +
drivers/net/gianfar_sysfs.c | 10 +-
drivers/net/irda/nsc-ircc.c | 6 +
drivers/net/irda/smsc-ircc2.c | 5 +-
drivers/net/macvlan.c | 2 +-
drivers/net/mlx4/mr.c | 2 +-
drivers/net/mv643xx_eth.c | 160 ++++-
drivers/net/niu.c | 11 +-
drivers/net/pcnet32.c | 61 +--
drivers/net/phy/phy.c | 2 +-
drivers/net/tulip/uli526x.c | 38 +-
drivers/net/ucc_geth.c | 278 ++++----
drivers/net/ucc_geth.h | 48 +-
drivers/net/ucc_geth_ethtool.c | 6 -
drivers/net/ucc_geth_mii.c | 4 +-
drivers/net/usb/asix.c | 4 +
drivers/net/wan/lapbether.c | 1 +
drivers/net/wireless/iwlwifi/Kconfig | 3 +-
drivers/pci/probe.c | 33 +-
drivers/rtc/rtc-ds1511.c | 4 +-
drivers/rtc/rtc-s35390a.c | 2 +-
drivers/rtc/rtc-sh.c | 14 +-
drivers/s390/char/tty3270.c | 15 +-
drivers/s390/cio/blacklist.c | 323 +++++-----
drivers/s390/cio/cio.c | 39 +-
drivers/s390/cio/cio.h | 2 -
drivers/s390/cio/cio_debug.h | 6 -
drivers/s390/cio/css.c | 4 +-
drivers/s390/cio/device.c | 25 +-
drivers/s390/cio/device_fsm.c | 44 +-
drivers/s390/cio/device_id.c | 4 +-
drivers/s390/cio/device_pgid.c | 12 +-
drivers/s390/s390mach.c | 3 +-
drivers/sbus/char/bpp.c | 2 +-
drivers/scsi/Kconfig | 1 +
drivers/scsi/dpt_i2o.c | 78 +--
drivers/scsi/dpti.h | 13 -
drivers/serial/bfin_5xx.c | 98 +---
drivers/serial/serial_core.c | 3 +-
drivers/serial/sh-sci.c | 32 +-
drivers/serial/sh-sci.h | 27 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/serial/cp2101.c | 1 +
drivers/usb/serial/iuu_phoenix.c | 6 +-
drivers/video/bw2.c | 8 +-
drivers/video/cg14.c | 5 +-
drivers/video/cg3.c | 8 +-
drivers/video/cg6.c | 6 +-
drivers/video/ffb.c | 7 +-
drivers/video/leo.c | 7 +-
drivers/video/p9100.c | 7 +-
drivers/video/pxafb.c | 8 +-
drivers/video/sbuslib.c | 9 +-
drivers/video/sbuslib.h | 5 +-
drivers/video/sunxvr2500.c | 3 +-
drivers/video/sunxvr500.c | 3 +-
drivers/video/tcx.c | 25 +-
fs/affs/affs.h | 4 +-
fs/affs/file.c | 25 +-
fs/affs/inode.c | 34 +-
fs/affs/namei.c | 6 +-
fs/affs/super.c | 18 +-
fs/bio.c | 3 +-
fs/cifs/CHANGES | 3 +
fs/cifs/asn1.c | 10 +-
fs/cifs/cifs_dfs_ref.c | 25 +-
fs/cifs/cifsacl.c | 16 +-
fs/cifs/cifsfs.c | 72 +-
fs/cifs/cifsfs.h | 10 +-
fs/cifs/cifsglob.h | 44 +-
fs/cifs/cifspdu.h | 2 +-
fs/cifs/cifsproto.h | 15 +-
fs/cifs/cifssmb.c | 38 +-
fs/cifs/connect.c | 153 +++---
fs/cifs/dir.c | 18 +-
fs/cifs/dns_resolve.c | 62 ++-
fs/cifs/fcntl.c | 2 +-
fs/cifs/file.c | 80 ++--
fs/cifs/inode.c | 46 +-
fs/cifs/link.c | 2 +-
fs/cifs/misc.c | 33 +-
fs/cifs/netmisc.c | 32 +-
fs/cifs/readdir.c | 12 +-
fs/cifs/smbencrypt.c | 8 +-
fs/cifs/xattr.c | 2 +-
fs/inode.c | 5 -
fs/locks.c | 19 +-
fs/pipe.c | 21 +
fs/proc/task_mmu.c | 2 -
fs/proc/task_nommu.c | 1 +
fs/splice.c | 31 +-
fs/udf/namei.c | 145 ++++-
fs/udf/partition.c | 4 +-
fs/udf/super.c | 1 +
fs/udf/udfdecl.h | 1 +
include/asm-alpha/types.h | 6 +
include/asm-arm/arch-pxa/pm.h | 2 +-
include/asm-arm/arch-pxa/system.h | 3 +-
include/asm-blackfin/dpmc.h | 10 +-
include/asm-blackfin/entry.h | 5 +
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 5 +
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 5 +
include/asm-blackfin/mach-bf533/defBF532.h | 2 +
include/asm-blackfin/mach-bf533/irq.h | 14 +-
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 5 +
include/asm-blackfin/mach-bf537/irq.h | 35 +-
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 3 +
include/asm-blackfin/mach-bf548/defBF54x_base.h | 20 +
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 5 +
include/asm-blackfin/mach-bf561/defBF561.h | 28 +
include/asm-blackfin/mach-bf561/irq.h | 13 +-
include/asm-blackfin/mach-common/context.S | 5 +
include/asm-blackfin/time.h | 4 +
include/asm-m68k/machw.h | 30 -
include/asm-mips/types.h | 2 -
include/asm-mn10300/processor.h | 2 +-
include/asm-powerpc/io.h | 8 +-
include/asm-powerpc/kvm_host.h | 1 +
include/asm-powerpc/kvm_ppc.h | 5 +
include/asm-powerpc/pgtable-ppc32.h | 7 +
include/asm-powerpc/spu.h | 9 +-
include/asm-powerpc/spu_csa.h | 3 +-
include/asm-powerpc/syscalls.h | 2 +-
include/asm-s390/kvm_host.h | 1 +
include/asm-s390/page.h | 11 +
include/asm-s390/ptrace.h | 2 +
include/asm-s390/system.h | 6 +
include/asm-sh/cpu-sh3/dma.h | 10 +-
include/asm-sh/hw_irq.h | 19 +
include/asm-sh/io.h | 12 +-
include/asm-sh/keyboard.h | 13 -
include/asm-sh/mmu_context.h | 4 +-
include/asm-sh/mmzone.h | 2 +
include/asm-sh/mpc1211/dma.h | 303 ---------
include/asm-sh/mpc1211/io.h | 22 -
include/asm-sh/mpc1211/keyboard.h | 60 --
include/asm-sh/mpc1211/m1543c.h | 200 ------
include/asm-sh/mpc1211/mc146818rtc.h | 6 -
include/asm-sh/mpc1211/mpc1211.h | 18 -
include/asm-sh/mpc1211/pci.h | 38 --
include/asm-sh/r7780rp.h | 4 +-
include/asm-sh/tlb_64.h | 10 +-
include/asm-sh/topology.h | 11 +
include/asm-sh/uaccess_64.h | 2 +
include/asm-sparc/psr.h | 1 +
include/asm-sparc/ptrace.h | 11 +
include/asm-sparc/signal.h | 8 +-
include/asm-sparc64/psrcompat.h | 2 +
include/asm-sparc64/pstate.h | 1 +
include/asm-sparc64/ptrace.h | 11 +-
include/asm-sparc64/signal.h | 8 +-
include/asm-sparc64/ttable.h | 7 +-
include/asm-x86/bitops.h | 37 +-
include/asm-x86/bootparam.h | 8 +-
include/asm-x86/geode.h | 12 +-
include/asm-x86/i387.h | 10 +-
include/asm-x86/kvm_host.h | 10 +-
include/asm-x86/pat.h | 8 +
include/asm-x86/pgtable_32.h | 9 +-
include/asm-x86/pgtable_64.h | 6 +-
include/asm-x86/spinlock.h | 18 +-
include/asm-x86/topology.h | 18 +-
include/linux/compiler.h | 12 +
include/linux/exportfs.h | 21 +
include/linux/fs.h | 6 -
include/linux/genhd.h | 35 +-
include/linux/hardirq.h | 18 +-
include/linux/hrtimer.h | 9 +
include/linux/i2c.h | 2 +-
include/linux/io.h | 1 +
include/linux/ioprio.h | 14 +
include/linux/kgdb.h | 4 +-
include/linux/libata.h | 13 +
include/linux/mv643xx_eth.h | 16 +-
include/linux/netfilter/nf_conntrack_sip.h | 1 +
include/linux/of_i2c.h | 4 -
include/linux/pci.h | 5 +-
include/linux/phy.h | 5 +
include/linux/rcupdate.h | 12 -
include/linux/sched.h | 44 ++-
include/linux/sysfs.h | 6 -
include/linux/vermagic.h | 8 +-
include/media/v4l2-i2c-drv-legacy.h | 2 +
include/media/v4l2-i2c-drv.h | 2 +
include/net/ip.h | 2 +-
include/net/xfrm.h | 48 ++-
init/Kconfig | 28 +-
init/main.c | 1 +
ipc/mqueue.c | 3 +-
kernel/Makefile | 2 +-
kernel/cpuset.c | 52 ++-
kernel/futex.c | 176 +-----
kernel/hrtimer.c | 9 -
kernel/kgdb.c | 8 +-
kernel/module.c | 65 ++-
kernel/relay.c | 2 +-
kernel/sched.c | 352 ++++-------
kernel/sched_clock.c | 236 +++++++
kernel/sched_debug.c | 7 -
kernel/sched_fair.c | 50 +-
kernel/sched_idletask.c | 2 +-
kernel/sched_rt.c | 9 +-
kernel/time/clocksource.c | 4 +-
lib/Kconfig.kgdb | 16 +-
lib/devres.c | 2 +-
lib/kernel_lock.c | 120 +++--
mm/filemap.c | 2 +-
mm/memory.c | 5 +-
mm/slub.c | 2 +-
net/atm/br2684.c | 4 +-
net/bridge/br_if.c | 12 +-
net/can/af_can.c | 16 +-
net/can/bcm.c | 6 -
net/core/dev.c | 12 +-
net/core/skbuff.c | 4 +-
net/dccp/feat.c | 2 +-
net/decnet/dn_route.c | 12 +-
net/ipv4/ip_input.c | 2 +-
net/ipv4/route.c | 18 +-
net/ipv4/tcp_input.c | 28 +-
net/ipv6/route.c | 6 +-
net/ipv6/sit.c | 2 +-
net/mac80211/main.c | 7 +-
net/mac80211/rc80211_pid_debugfs.c | 4 +-
net/netfilter/Kconfig | 4 +
net/netfilter/nf_conntrack_sip.c | 22 +-
net/sched/act_simple.c | 45 +-
net/sched/sch_htb.c | 8 +-
net/sunrpc/svc.c | 1 -
net/tipc/core.h | 11 +-
scripts/kconfig/lkc.h | 6 +-
scripts/kconfig/mconf.c | 3 +-
scripts/mod/file2alias.c | 35 +-
sound/drivers/Kconfig | 4 +-
sound/drivers/pcsp/pcsp.c | 4 +
sound/oss/kahlua.c | 2 +-
sound/pci/Kconfig | 5 +-
sound/pci/ac97/ac97_patch.c | 9 +-
sound/pci/hda/patch_realtek.c | 5 +-
sound/pci/hda/patch_sigmatel.c | 2 +
sound/soc/at91/at91-pcm.c | 11 +-
sound/soc/at91/at91-ssc.c | 2 +-
sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +
sound/soc/s3c24xx/s3c24xx-pcm.c | 2 +-
virt/kvm/kvm_main.c | 1 +
544 files changed, 8521 insertions(+), 6581 deletions(-)
delete mode 100644 Documentation/scheduler/sched-design.txt
create mode 100644 arch/blackfin/mach-common/dpmc.c
rename arch/blackfin/mach-common/{dpmc.S => dpmc_modes.S} (82%)
create mode 100644 arch/powerpc/lib/devres.c
create mode 100644 arch/s390/mm/page-states.c
delete mode 100644 arch/sh/boards/mpc1211/Makefile
delete mode 100644 arch/sh/boards/mpc1211/pci.c
delete mode 100644 arch/sh/boards/mpc1211/rtc.c
delete mode 100644 arch/sh/boards/mpc1211/setup.c
create mode 100644 arch/sh/kernel/cpu/sh3/setup-sh3.c
create mode 100644 drivers/ata/pata_sch.c
delete mode 100644 drivers/mtd/maps/mpc1211.c
delete mode 100644 include/asm-sh/keyboard.h
delete mode 100644 include/asm-sh/mpc1211/dma.h
delete mode 100644 include/asm-sh/mpc1211/io.h
delete mode 100644 include/asm-sh/mpc1211/keyboard.h
delete mode 100644 include/asm-sh/mpc1211/m1543c.h
delete mode 100644 include/asm-sh/mpc1211/mc146818rtc.h
delete mode 100644 include/asm-sh/mpc1211/mpc1211.h
delete mode 100644 include/asm-sh/mpc1211/pci.h
create mode 100644 kernel/sched_clock.c
--
Touchscreen drivers for WM9705, WM9712, WM9713 and WM9715.
More information about the touch-commits
mailing list