Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756613AbbHZHx2 (ORCPT ); Wed, 26 Aug 2015 03:53:28 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]:35392 "EHLO mail-ob0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756585AbbHZHxZ (ORCPT ); Wed, 26 Aug 2015 03:53:25 -0400 MIME-Version: 1.0 In-Reply-To: <20150825202439.GA25236@lst.de> References: <20150825200756.GA25409@roeck-us.net> <20150825201532.GA24940@lst.de> <20150825202140.GB25409@roeck-us.net> <20150825202439.GA25236@lst.de> Date: Wed, 26 Aug 2015 10:53:25 +0300 Message-ID: Subject: Re: xtensa build failures in -next due to DMA API changes From: Max Filippov To: Christoph Hellwig Cc: Guenter Roeck , Chris Zankel , Andrew Morton , "linux-xtensa@linux-xtensa.org" , LKML Content-Type: multipart/mixed; boundary=089e011843e838ca23051e322542 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5351 Lines: 91 --089e011843e838ca23051e322542 Content-Type: text/plain; charset=UTF-8 On Tue, Aug 25, 2015 at 11:24 PM, Christoph Hellwig wrote: > On Tue, Aug 25, 2015 at 01:21:40PM -0700, Guenter Roeck wrote: >> I also see >> >> arch/xtensa/include/asm/dma-mapping.h:#include >> >> It looks like there is a conflict with "xtensa: reimplement DMA API using common >> helpers" by Max Filippov, which added the include. This patch is in -next. > > Oh. That one clashes badly with my whole series, basically each > of my patches will need the same work done for the other architectures > applied to xtensa as well. > > In terms of effort it might be a better idea to rebase the patch from > Max on top of the series, as it will become a lot simpler that way. Looks like I just need to remove now redundant function definitions from xtensa/include/asm/dma-mapping.h. A patch that removes these functions is attached, but I'm not sure where it should go. To the Andrew's tree? Or should the xtensa tree merge Christoph's series and apply it on top? -- Thanks. -- Max --089e011843e838ca23051e322542 Content-Type: text/x-patch; charset=US-ASCII; name="0001-xtensa-remove-duplicate-definitions-from-dma-mapping.patch" Content-Disposition: attachment; filename="0001-xtensa-remove-duplicate-definitions-from-dma-mapping.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_idshhcfe0 RnJvbSA4NzA3YTZiZDlmOWJiNGU0MGRjOTgxYmUxMDRlMmVhYTdiNjM1NWE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXggRmlsaXBwb3YgPGpjbXZia2JjQGdtYWlsLmNvbT4KRGF0 ZTogV2VkLCAyNiBBdWcgMjAxNSAwODo0MjoxOCArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIHh0ZW5z YTogcmVtb3ZlIGR1cGxpY2F0ZSBkZWZpbml0aW9ucyBmcm9tIGRtYS1tYXBwaW5nLmgKCkRNQSBB UEkgcmVpbXBsZW1lbnRhdGlvbiBmb3IgeHRlbnNhIGNvbmZsaWN0cyB3aXRoIGRtYS1tYXBwaW5n CmNvbnNvbGlkYXRpb24gc2VyaWVzIGZyb20gQ2hyaXN0b3BoIEhlbGx3aWc6IG5vdyBib3RoIHh0 ZW5zYQpkbWEtbWFwcGluZy5oIGFuZCBkbWEtbWFwcGluZy1jb21tb24uaCBkZWZpbmUgbWFueSBk bWFfKiBmdW5jdGlvbnMuCgpSZW1vdmUgZXh0cmEgZGVmaW5pdGlvbnMgZnJvbSB4dGVuc2Etc3Bl Y2lmaWMgZG1hLW1hcHBpbmcuaAoKU2lnbmVkLW9mZi1ieTogTWF4IEZpbGlwcG92IDxqY212Ymti Y0BnbWFpbC5jb20+Ci0tLQogYXJjaC94dGVuc2EvaW5jbHVkZS9hc20vZG1hLW1hcHBpbmcuaCB8 IDYwIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg NjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94dGVuc2EvaW5jbHVkZS9hc20vZG1h LW1hcHBpbmcuaCBiL2FyY2gveHRlbnNhL2luY2x1ZGUvYXNtL2RtYS1tYXBwaW5nLmgKaW5kZXgg ZjAxY2IzMC4uNDQyN2YzOCAxMDA2NDQKLS0tIGEvYXJjaC94dGVuc2EvaW5jbHVkZS9hc20vZG1h LW1hcHBpbmcuaAorKysgYi9hcmNoL3h0ZW5zYS9pbmNsdWRlL2FzbS9kbWEtbWFwcGluZy5oCkBA IC0zMiw2NiArMzIsNiBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBkbWFfbWFwX29wcyAqZ2V0X2Rt YV9vcHMoc3RydWN0IGRldmljZSAqZGV2KQogCiAjaW5jbHVkZSA8YXNtLWdlbmVyaWMvZG1hLW1h cHBpbmctY29tbW9uLmg+CiAKLSNkZWZpbmUgZG1hX2FsbG9jX25vbmNvaGVyZW50KGQsIHMsIGgs IGYpIGRtYV9hbGxvY19hdHRycyhkLCBzLCBoLCBmLCBOVUxMKQotI2RlZmluZSBkbWFfZnJlZV9u b25jb2hlcmVudChkLCBzLCB2LCBoKSBkbWFfZnJlZV9hdHRycyhkLCBzLCB2LCBoLCBOVUxMKQot I2RlZmluZSBkbWFfYWxsb2NfY29oZXJlbnQoZCwgcywgaCwgZikgZG1hX2FsbG9jX2F0dHJzKGQs IHMsIGgsIGYsIE5VTEwpCi0jZGVmaW5lIGRtYV9mcmVlX2NvaGVyZW50KGQsIHMsIGMsIGgpIGRt YV9mcmVlX2F0dHJzKGQsIHMsIGMsIGgsIE5VTEwpCi0KLXN0YXRpYyBpbmxpbmUgdm9pZCAqZG1h X2FsbG9jX2F0dHJzKHN0cnVjdCBkZXZpY2UgKmRldiwgc2l6ZV90IHNpemUsCi0JCQkJICAgIGRt YV9hZGRyX3QgKmRtYV9oYW5kbGUsIGdmcF90IGdmcCwKLQkJCQkgICAgc3RydWN0IGRtYV9hdHRy cyAqYXR0cnMpCi17Ci0Jdm9pZCAqcmV0OwotCXN0cnVjdCBkbWFfbWFwX29wcyAqb3BzID0gZ2V0 X2RtYV9vcHMoZGV2KTsKLQotCWlmIChkbWFfYWxsb2NfZnJvbV9jb2hlcmVudChkZXYsIHNpemUs IGRtYV9oYW5kbGUsICZyZXQpKQotCQlyZXR1cm4gcmV0OwotCi0JcmV0ID0gb3BzLT5hbGxvYyhk ZXYsIHNpemUsIGRtYV9oYW5kbGUsIGdmcCwgYXR0cnMpOwotCWRlYnVnX2RtYV9hbGxvY19jb2hl cmVudChkZXYsIHNpemUsICpkbWFfaGFuZGxlLCByZXQpOwotCi0JcmV0dXJuIHJldDsKLX0KLQot c3RhdGljIGlubGluZSB2b2lkIGRtYV9mcmVlX2F0dHJzKHN0cnVjdCBkZXZpY2UgKmRldiwgc2l6 ZV90IHNpemUsCi0JCQkJICB2b2lkICp2YWRkciwgZG1hX2FkZHJfdCBkbWFfaGFuZGxlLAotCQkJ CSAgc3RydWN0IGRtYV9hdHRycyAqYXR0cnMpCi17Ci0Jc3RydWN0IGRtYV9tYXBfb3BzICpvcHMg PSBnZXRfZG1hX29wcyhkZXYpOwotCi0JaWYgKGRtYV9yZWxlYXNlX2Zyb21fY29oZXJlbnQoZGV2 LCBnZXRfb3JkZXIoc2l6ZSksIHZhZGRyKSkKLQkJcmV0dXJuOwotCi0Jb3BzLT5mcmVlKGRldiwg c2l6ZSwgdmFkZHIsIGRtYV9oYW5kbGUsIGF0dHJzKTsKLQlkZWJ1Z19kbWFfZnJlZV9jb2hlcmVu dChkZXYsIHNpemUsIHZhZGRyLCBkbWFfaGFuZGxlKTsKLX0KLQotc3RhdGljIGlubGluZSBpbnQK LWRtYV9tYXBwaW5nX2Vycm9yKHN0cnVjdCBkZXZpY2UgKmRldiwgZG1hX2FkZHJfdCBkbWFfYWRk cikKLXsKLQlzdHJ1Y3QgZG1hX21hcF9vcHMgKm9wcyA9IGdldF9kbWFfb3BzKGRldik7Ci0KLQlk ZWJ1Z19kbWFfbWFwcGluZ19lcnJvcihkZXYsIGRtYV9hZGRyKTsKLQlyZXR1cm4gb3BzLT5tYXBw aW5nX2Vycm9yKGRldiwgZG1hX2FkZHIpOwotfQotCi1zdGF0aWMgaW5saW5lIGludAotZG1hX3N1 cHBvcnRlZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHU2NCBtYXNrKQotewotCXJldHVybiAxOwotfQot Ci1zdGF0aWMgaW5saW5lIGludAotZG1hX3NldF9tYXNrKHN0cnVjdCBkZXZpY2UgKmRldiwgdTY0 IG1hc2spCi17Ci0JaWYoIWRldi0+ZG1hX21hc2sgfHwgIWRtYV9zdXBwb3J0ZWQoZGV2LCBtYXNr KSkKLQkJcmV0dXJuIC1FSU87Ci0KLQkqZGV2LT5kbWFfbWFzayA9IG1hc2s7Ci0KLQlyZXR1cm4g MDsKLX0KLQogdm9pZCBkbWFfY2FjaGVfc3luYyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHZvaWQgKnZh ZGRyLCBzaXplX3Qgc2l6ZSwKIAkJICAgIGVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpcmVjdGlv bik7CiAKLS0gCjEuOC4xLjQKCg== --089e011843e838ca23051e322542-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/