From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3FCBE92FF8 for ; Fri, 6 Oct 2023 08:32:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 250008E000E; Fri, 6 Oct 2023 04:32:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FF968E000B; Fri, 6 Oct 2023 04:32:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C9568E000E; Fri, 6 Oct 2023 04:32:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F2D418E000B for ; Fri, 6 Oct 2023 04:32:18 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C32EA160559 for ; Fri, 6 Oct 2023 08:32:18 +0000 (UTC) X-FDA: 81314369556.02.9E4649A Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) by imf04.hostedemail.com (Postfix) with ESMTP id 8141440015 for ; Fri, 6 Oct 2023 08:32:16 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of glaubitz@zedat.fu-berlin.de designates 130.133.4.66 as permitted sender) smtp.mailfrom=glaubitz@zedat.fu-berlin.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696581137; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BFh5RLPCgxHRURpmz01CCyioMwIn/l1QPKrXZEjqRak=; b=RpPuC+wPpJCd70E+nYcvxL+4tXG3OYw3d1DXdlr7CLuiSGNRplGnvB+89+tqoVeBpoiG/M qH314ppWrv8ig74gQ9eQgIMoRtq9Kqxyo62Qn9oxrq6cz9mxXkn6itPcEzr2KymJilZVKa 6SCsff2Gk/WXlhoPGlqFCD9sBiSVLQQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of glaubitz@zedat.fu-berlin.de designates 130.133.4.66 as permitted sender) smtp.mailfrom=glaubitz@zedat.fu-berlin.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696581137; a=rsa-sha256; cv=none; b=Ii0zk3aM4ATl+VCzyiasg2TV5VPWBIpQfZKSVUtAZUkqwnEkT5LZCT+8FR61loLB2f2psg 4Lg/ZqgrtQbJ+FKOImhoTwNPh5t/qzrHBAn7P3bJ1f0aN5gm0BFhwLLmiz8Bu5rQTFbjh/ fi7MSqgmLj+69p5OCChRpe9DVy+ORDg= Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost.zedat.fu-berlin.de (Exim 4.95) with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1qogFl-002AIM-AA; Fri, 06 Oct 2023 10:32:09 +0200 Received: from dynamic-077-011-061-166.77.11.pool.telefonica.de ([77.11.61.166] helo=[192.168.1.12]) by inpost2.zedat.fu-berlin.de (Exim 4.95) with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1qogFl-003cs4-1p; Fri, 06 Oct 2023 10:32:09 +0200 Message-ID: <75ea07e52350df5d3581bd14939504f0896073aa.camel@physik.fu-berlin.de> Subject: Re: [PATCH v5 3/4] arch/*/io.h: remove ioremap_uc in some architectures From: John Paul Adrian Glaubitz To: Baoquan He , linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, arnd@arndb.de, jiaxun.yang@flygoat.com, mpe@ellerman.id.au, geert@linux-m68k.org, mcgrof@kernel.org, hch@infradead.org, tsbogend@alpha.franken.de, f.fainelli@gmail.com, deller@gmx.de, linux-alpha@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org Date: Fri, 06 Oct 2023 10:31:59 +0200 In-Reply-To: <20230921110424.215592-4-bhe@redhat.com> References: <20230921110424.215592-1-bhe@redhat.com> <20230921110424.215592-4-bhe@redhat.com> Autocrypt: addr=glaubitz@physik.fu-berlin.de; prefer-encrypt=mutual; keydata=mQINBE3JE9wBEADMrYGNfz3oz6XLw9XcWvuIxIlPWoTyw9BxTicfGAv0d87wngs9U+d52t/REggPePf34gb7/k8FBY1IgyxnZEB5NxUb1WtW0M3GUxpPx6gBZqOm7SK1ZW3oSORw+T7Aezl3Zq4Nr4Nptqx7fnLpXfRDs5iYO/GX8WuL8fkGS/gIXtxKewd0LkTlb6jq9KKq8qn8/BN5YEKqJlM7jsENyA5PIe2npN3MjEg6p+qFrmrzJRuFjjdf5vvGfzskrXCAKGlNjMMA4TgZvugOFmBI/iSyV0IOaj0uKhes0ZNX+lQFrOB4j6I5fTBy7L/T3W/pCWo3wVkknNYa8TDYT73oIZ7Aimv+k7OzRfnxsSOAZT8Re1Yt8mvzr6FHVFjr/VdyTtO5JgQZ6LEmvo4Ro+2ByBmCHORCQ0NJhD1U3avjGfvfslG999W0WEZLTeaGkBAN1yG/1bgGAytQQkD9NsVXqBy7S3LVv9bB844ysW5Aj1nvtgIz14E2WL8rbpfjJMXi7B5ha6Lxf3rFOgxpr6ZoEn+bGG4hmrO+/ReA4SerfMqwSTnjZsZvxMJsx2B9c8DaZE8GsA4I6lsihbJmXhw8i7Cta8Dx418wtEbXhL6m/UEk60O7QD1VBgGqDMnJDFSlvKa9D+tZde/kHSNmQmLLzxtDbNgBgmR0jUlmxirijnm8bwARAQABtEBKb2huIFBhdWwgQWRyaWFuIEdsYXViaXR6IChEZWJpYW4gUHJvamVjdCkgPGdsYXViaXR6QGRlYmlhbi5vcmc+iQI3BBMBCAAhBQJRnmPwAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEHQmOzf1tfkTF0gQAJgvGiKf5YW6+Qyss1qGwf+KHXb/6gIThY6GpSIro9vL/UxaakRCOloaXXAs3KpgBULOO8+prqU8GIqcd8tE3YvQFvvO3rN+8bhOiiD0lFmQSEHcp CW5ZRpdh J5wy1t9Ddb1K/7XGzen3Uzx9bjKgDyikM3js1VtJHaFr8FGt5gtZIBDgp8QM9IRCv/32mPQxqmsaTczEzSNxTBM6Tc2NwNLus3Yh5OnFdxk1jzk+Ajpnqd/E/M7/CU5QznDgIJyopcMtOArv9Er+xe3gAXHkFvnPqcP+9UpzHB5N0HPYn4k4hsOTiJ41FHUapq8d1AuzrWyqzF9aMUi2kbHJdUmt9V39BbJIgjCysZPyGtFhR42fXHDnPARjxtRRPesEhjOeHei9ioAsZfT6bX+l6kSf/9gaxEKQe3UCXd3wbw68sXcvhzBVBxhXM91+Y7deHhNihMtqPyEmSyGXTHOMODysRU453E+XXTr2HkZPx4NV1dA8Vlid2NcMQ0iItD+85xeVznc8xquY/c1vPBeqneBWaE530Eo5e3YA7OGrxHwHbet3E210ng+xU8zUjQrFXMJm3xNpOe45RwmhCAt5z1gDTk5qNgjNgnU3mDp9DX6IffS3g2UJ02JeTrBY4hMpdVlmGCVOm9xipcPHreVGEBbM4eQnYnwbaqjVBBvy2DyfyN/tFRKb2huIFBhdWwgQWRyaWFuIEdsYXViaXR6IChGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluKSA8Z2xhdWJpdHpAcGh5c2lrLmZ1LWJlcmxpbi5kZT6JAlEEEwEIADsCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AWIQRi/4p1hOApVpVGAAZ0Jjs39bX5EwUCWhQoUgIZAQAKCRB0Jjs39bX5Ez/ID/98r9c4WUSgOHVPSMVcOVziMOi+zPWfF1OhOXW+atpTM4LSSp66196xOlDFHOdNNmO6kxckXAX9ptvpBc0mRxa7OrC168fKzqR7P75eTsJnVaOu+uI/vvgsbUIosYdkkekCxDAbYCUwmzNotIspnFbxiSPMNrpw7Ud/yQkS9TDYeXnrZDhBp7p5+naWCD/yMvh7yVCA4E a8+xDVoX +kjv6EHJrwVupOpMa39cGs2rKYZbWTazcflKH+bXG3FHBrwh9XRjA6A1CTeC/zTVNgGF6wvw/qT2x9tS7WeeZ1jvBCJub2cb07qIfuvxXiGcYGr+W4z9GuLCiWsMmoff/Gmo1aeMZDRYKLAZLGlEr6zkYh1Abtiz0YLqIYVbZAnf8dCjmYhuwPq77IeqSjqUqI2Cb0oOOlwRKVWDlqAeo0Bh8DrvZvBAojJf4HnQZ/pSz0yaRed/0FAmkVfV+1yR6BtRXhkRF6NCmguSITC96IzE26C6n5DBb43MR7Ga/mof4MUufnKADNG4qz57CBwENHyx6ftWJeWZNdRZq10o0NXuCJZf/iulHCWS/hFOM5ygfONq1Vsj2ZDSWvVpSLj+Ufd2QnmsnrCr1ZGcl72OC24AmqFWJY+IyReHWpuABEVZVeVDQooJ0K4yqucmrFR7HyH7oZGgR0CgYHCI+9yhrXHrQpyLQ/Sm9obiBQYXVsIEFkcmlhbiBHbGF1Yml0eiAoU1VTRSBMSU5VWCBHbWJIKSA8Z2xhdWJpdHpAc3VzZS5jb20+iQJOBBMBCAA4FiEEYv+KdYTgKVaVRgAGdCY7N/W1+RMFAloSyhICGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQdCY7N/W1+ROnkQ//X6LVYXPi1D8/XFsoi0HDCvZhbWSzcGw6MQZKmTk42mNFKm/OrYBJ9d1St4Q3nRwH/ELzGb8liA02d4Ul+DV1Sv3P540LzZ4mmCi9wV+4Ohn6cXfaJNaTmHy1dFvg1NrVjMqGAFZkhTXRAvjRIQItyRvL//gKaciyKB/T0C3CIzbuTLBqtZMIIuP5nIgkwBvdw6H7EQ7kqOAO85S4FDSum/cLwLzdKygyvmPNOOtxvxa9QIryLf6h7HfWg68DvGDqIV9ZBoi8JjYZrZzaBmlPV8Iwm52uYnzsKM/LoyZ0G4v2u/WEtQEl7deLJjKby3k KmZGh9hQ YImvOkrd9z8LQSvu0e8Qm8+JbRCCqUGkAPrRDFIzH8nFCFGCU/V+4LT2j68KMbApLkDQAFEDBcQVJYGnOZf7eU/EtYQIqVmGEjdOP7Qf/yMFzhc9GBXeE5mbe0LwA5LOO74FDH5qjwB5KI6VkTWPoXJoZA5waVC2sUSYOnmwFINkCLyyDoWaL9ubSbU9KTouuNm4F6XIssMHuX4OIKA7b2Kn5qfUFbd0ls8d5mY2gKcXBfEY+eKkhmuwZhd/7kP10awC3DF3QGhgqpaS100JW8z78el7moijZONwqXCS3epUol6q1pJ+zcapcFzO3KqcHTdVOKh6CXQci3Yv5NXuWDs/l2dMH4t2NvZC5Ag0ETckULgEQAKwmloVWzF8PYh5jB9ATf07kpnirVYf/kDk+QuVMPlydwPjh6/awfkqZ3SRHAyIb+9IC66RLpaF4WSPVWGs307+pa5AmTm16vzYA0DJ7vvRPxPzxPYq6p2WTjFqbq0EYeNTIm0YotIkq/gB9iIUS+gjdnoGSA+n/dwnbu1Eud2aiMW16ILqhgdgitdeW3J7LMDFvWIlXoBQOSfXQDLAiPf+jPJYvgkmCAovYKtC3aTg3bFX2sZqOPsWBXV6Azd92/GMs4W4fyOYLVSEaXy/mI35PMQLH8+/MM4n0g3JEgdzRjwF77Oh8SnOdG73/j+rdrS6Zgfyq6aM5WWs6teopLWPe0LpchGPSVgohIA7OhCm+ME8fpVHuMkvXqPeXAVfmJS/gV5CUgDMsYEjst+QXgWnlEiK2Knx6WzZ+v54ncA4YP58cibPJj5Qbx4gi8KLY3tgIbWJ3QxIRkChLRGjEBIQ4vTLAhh3vtNEHoAr9xUb3h8MxqYWNWJUSLS4xeE3Bc9UrB599Hu7i0w3v6VDGVCndcVO91lq9DZVhtYOPSE8mgacHb/3LP0UOZWmGHor52oPNU3Dwg205u814sKOd2i0DmY+Lt4EkLwFIYGE0FLLT HZDjDp9D 0iKclQKt86xBRGH+2zUk3HRq4MArggXuA4CN1buCzqAHiONvLdnY9StRABEBAAGJAh8EGAEIAAkFAk3JFC4CGwwACgkQdCY7N/W1+ROvNxAAtYbssC+AZcU4+xU5uxYinefyhB+f6GsS0Ddupp/MkZD/y98cIql8XXdIZ6z8lHvJlDq0oOyizLpfqUkcT4GhwMbdSNYUGd9HCdY/0pAyFdiJkn++WM8+b+9nz4mC6vfh96imcK4KH/cjP7NG37El/xlshWrb6CqKPk4KxNK5rUMPNr7+/3GwwGHHkJtW0QfDa/GoD8hl2HI6IQI+zSXK2uIZ7tcFMN8g9OafwUZ7b+zbz1ldzqOwygliEuEaRHeiOhPrTdxgnj6kTnitZw7/hSVi5Mr8C4oHzWgi66Ov9vdmClTHQSEjWDeLOiBj61xhr6A8KPUVaOpAYZWBH4OvtnmjwsKuNCFXym2DcCywdjEdrLC+Ms5g6Dkd60BQz4/kHA7x+P9IAkPqkaWAEyHoEvM1OcUPJzy/JW2vWDXo2jjM8PEQfNIPtqDzid1s8aDLJsPLWlJnfUyMP2ydlTtR54oiVBlFwqqHoPIaJrwTkND5lgFiMIwup3+giLiDOBILtiOSpYxBfSJkz3GGacOb4Xcj8AXV1tpUo1dxAKpJ1ro0YHLJvOJ8nLiZyJsCabUePNRFprbh+srI+WIUVRm0D33bI1VEH2XUXZBL+AmfdKXbHAYtZ0anKgDbcwvlkBcHpA85NpRqjUQ4OerPqtCrWLHDpEwGUBlaQ//AGix+L9c= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.0 MIME-Version: 1.0 X-Original-Sender: glaubitz@physik.fu-berlin.de X-Originating-IP: 77.11.61.166 X-ZEDAT-Hint: PO X-Rspam-User: X-Stat-Signature: gq41943q3mk7mmyhquyxspgj338mpmsb X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8141440015 X-HE-Tag: 1696581136-889301 X-HE-Meta: U2FsdGVkX1/hvUeKIXTGst5AkV3xnpbEiGouEXtt2AqfnMm6rgk+I74BqNcr8aJ4NkodroCg1lYVN/QQCf9CNfIwNghppdEG5QqewbOiYx7haIh89Hrm4NP2bcta6yPwRcqN+u+Nnf2pzLcRFVNrSUzXhLRRWpenzNrHIKAVoMSah/l37rTVBWkxdjpGDy1aWtxkoJuZg7Yk8UgErgi64oZ0X8UXefzfK6Ldp8gLDj2SOuj2E7OKGNaa8x3qwbebti3HAGbXHkHEW7cbHnpoc93cJtbFaWXyWld+hTFlEv8X11HpcDhGqkYvjIg0Wuh/HwhzAZZadggJ8sWq17hD6CwEbW2TACiIY2n1z6ym8rSAvn3GazJOo6Jmdei7+Iq+nSMZlA7pVAB8vMcGlfFS178SwDtauG+1X65mogHG9iMMQ7VxsWI+ai3DRKlFpLxGyRjzBoMoKb1jZ4aaA8V4QAtQTzGcAy/GlaywvDx0dcz0b/dKowptuUICwHVXyddCznvjiBWIctmszoH91MNA9VnxWA4opvNyABjIoMUWfxX0tzkmZXywdEvhWwvigX8qhMErXkpBlLiAhlRaTwyPUoDeFcJ8XAYECvxDb1mU//fcWoOwum18HRW5Sn/8Meamxf7Awh1JR+XAnLuLIiRxm1odoLYddHN39S/AarJtSh9Gismo2xUBL2tU6jESqahw9G82wwT+NmDmJBdswSwpGzO4L0QtC9VDIOszB6ooA1BDa1GMjcvHXTelOlTrkDIUqLXQniZFfCe3ifiAhW1WHLczQ8xofee/0sUfZTOg2wn6Qbd6yaTql5O5jyk0u7Hu0s2IcbTqrzZlHdfk6Fgr73NotAfog+X4v+Ja4fSunJUsxTpAZVWJuK89JZqXZP/J01GWCSSFvivW2vmrT3d7+zyFtbL6fcRgfFRPAmB4QqBq4204sNlafSTLU/2KCq5qmpIs+cu9xfgufAicTKD szUFqj19 rQ1EnLYQqMuJJkfoEVMpYobIuGzkOMee74CAGAHF9wgA545sdommF+BJbLziIpeiphAihjd+ZywirLFKpxAA0Zq9TrNi/LyEBUmSRL995TNhJj5Zy9oTvbU9Xn/8VsSYwi6tPhq97eklVGkRRjjLDPjoqr+L0zYaOaX1QWZXcwc7JxI6JLU11Q4YUB0ApDDs6wzG3oQB+iQZeLMcKADuiec2s3H7fXrpCuOF/YihIz+956wzC7Ca1CdKZWCajMNZyfSwjHme7KVtr3fjfGvmz239naYqiCk6ES+FAz/Hz8w8RGvHSbrCexaWCkddu4UUHWwZ7jLiLf2+0Y+28fx5eCT4e062bts6WT8Oo9SkyrrKcPVe/0gDH23huTOsYcyMQJ0/+ScJewh8+WCXUq7Po6N1vBsl8cag2x1LxF06ij2dKpn7qhlnvLi9K/OU+dvPahER8qNzzsxAW9LX0A0Mxj7pyEMND/tOH36CwM4pQOS4h55VCk9psxvvh76d4x/Bsr6Ln3OE7qZvCDdjSt9uYhCxeOcxjE1KReZjh3tc5NW71MQCaK9fImPgL/LhBTGVTBXFYApeMEYyoMLMJDFlJL/be2XU4RBgJ4HuaiAxqmExPPORW2+JC79rUaZYeZqYMh8UtmXRlREImHC4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, 2023-09-21 at 19:04 +0800, Baoquan He wrote: > ioremap_uc() is only meaningful on old x86-32 systems with the PAT > extension, and on ia64 with its slightly unconventional ioremap() > behavior. So remove the ioremap_uc() definition in architecutures > other than x86 and ia64. These architectures all have asm-generic/io.h > included and will have the default ioremap_uc() definition which > returns NULL. >=20 > This changes the existing behaviour, while no need to worry about > any breakage because in the only callsite of ioremap_uc(), code > has been adjusted to eliminate the impact. Please see > atyfb_setup_generic() of drivers/video/fbdev/aty/atyfb_base.c. >=20 > If any new invocation of ioremap_uc() need be added, please consider > using ioremap() intead or adding a ARCH specific version if necessary. >=20 > Signed-off-by: Baoquan He > Acked-by: Geert Uytterhoeven > Acked-by: Michael Ellerman (powerpc) > Acked-by: Helge Deller # parisc > Cc: linux-alpha@vger.kernel.org > Cc: linux-hexagon@vger.kernel.org > Cc: linux-m68k@lists.linux-m68k.org > Cc: linux-mips@vger.kernel.org > Cc: linux-parisc@vger.kernel.org > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-sh@vger.kernel.org > Cc: sparclinux@vger.kernel.org > --- > Documentation/driver-api/device-io.rst | 9 +++++---- > arch/alpha/include/asm/io.h | 1 - > arch/hexagon/include/asm/io.h | 3 --- > arch/m68k/include/asm/kmap.h | 1 - > arch/mips/include/asm/io.h | 1 - > arch/parisc/include/asm/io.h | 2 -- > arch/powerpc/include/asm/io.h | 1 - > arch/sh/include/asm/io.h | 2 -- > arch/sparc/include/asm/io_64.h | 1 - > 9 files changed, 5 insertions(+), 16 deletions(-) >=20 > diff --git a/Documentation/driver-api/device-io.rst b/Documentation/drive= r-api/device-io.rst > index 2c7abd234f4e..d55384b106bd 100644 > --- a/Documentation/driver-api/device-io.rst > +++ b/Documentation/driver-api/device-io.rst > @@ -408,11 +408,12 @@ functions for details on the CPU side of things. > ioremap_uc() > ------------ > =20 > -ioremap_uc() behaves like ioremap() except that on the x86 architecture = without > -'PAT' mode, it marks memory as uncached even when the MTRR has designate= d > -it as cacheable, see Documentation/arch/x86/pat.rst. > +ioremap_uc() is only meaningful on old x86-32 systems with the PAT exten= sion, > +and on ia64 with its slightly unconventional ioremap() behavior, everywh= ere > +elss ioremap_uc() defaults to return NULL. > =20 > -Portable drivers should avoid the use of ioremap_uc(). > + > +Portable drivers should avoid the use of ioremap_uc(), use ioremap() ins= tead. > =20 > ioremap_cache() > --------------- > diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h > index 7aeaf7c30a6f..076f0e4e7f1e 100644 > --- a/arch/alpha/include/asm/io.h > +++ b/arch/alpha/include/asm/io.h > @@ -308,7 +308,6 @@ static inline void __iomem *ioremap(unsigned long por= t, unsigned long size) > } > =20 > #define ioremap_wc ioremap > -#define ioremap_uc ioremap > =20 > static inline void iounmap(volatile void __iomem *addr) > { > diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.= h > index e2b308e32a37..b7bc246dbcb1 100644 > --- a/arch/hexagon/include/asm/io.h > +++ b/arch/hexagon/include/asm/io.h > @@ -174,9 +174,6 @@ static inline void writel(u32 data, volatile void __i= omem *addr) > #define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \ > (__HEXAGON_C_DEV << 6)) > =20 > -#define ioremap_uc(addr, size) ioremap((addr), (size)) > - > - > #define __raw_writel writel > =20 > static inline void memcpy_fromio(void *dst, const volatile void __iomem = *src, > diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h > index 4efb3efa593a..b778f015c917 100644 > --- a/arch/m68k/include/asm/kmap.h > +++ b/arch/m68k/include/asm/kmap.h > @@ -25,7 +25,6 @@ static inline void __iomem *ioremap(unsigned long physa= ddr, unsigned long size) > return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); > } > =20 > -#define ioremap_uc ioremap > #define ioremap_wt ioremap_wt > static inline void __iomem *ioremap_wt(unsigned long physaddr, > unsigned long size) > diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h > index 41d8bd5adef8..1ecf255efb40 100644 > --- a/arch/mips/include/asm/io.h > +++ b/arch/mips/include/asm/io.h > @@ -170,7 +170,6 @@ void iounmap(const volatile void __iomem *addr); > */ > #define ioremap(offset, size) \ > ioremap_prot((offset), (size), _CACHE_UNCACHED) > -#define ioremap_uc ioremap > =20 > /* > * ioremap_cache - map bus memory into CPU space > diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h > index 366537042465..48630c78714a 100644 > --- a/arch/parisc/include/asm/io.h > +++ b/arch/parisc/include/asm/io.h > @@ -132,8 +132,6 @@ static inline void gsc_writeq(unsigned long long val,= unsigned long addr) > =20 > #define ioremap_wc(addr, size) \ > ioremap_prot((addr), (size), _PAGE_IOREMAP) > -#define ioremap_uc(addr, size) \ > - ioremap_prot((addr), (size), _PAGE_IOREMAP) > =20 > #define pci_iounmap pci_iounmap > =20 > diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.= h > index 0732b743e099..21bd3e8bffce 100644 > --- a/arch/powerpc/include/asm/io.h > +++ b/arch/powerpc/include/asm/io.h > @@ -900,7 +900,6 @@ void __iomem *ioremap_wt(phys_addr_t address, unsigne= d long size); > #endif > =20 > void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size); > -#define ioremap_uc(addr, size) ioremap((addr), (size)) > #define ioremap_cache(addr, size) \ > ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL)) > =20 > diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h > index f2f38e9d489a..790bea22c9b5 100644 > --- a/arch/sh/include/asm/io.h > +++ b/arch/sh/include/asm/io.h > @@ -302,8 +302,6 @@ unsigned long long poke_real_address_q(unsigned long = long addr, > ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL)) > #endif /* CONFIG_MMU */ > =20 > -#define ioremap_uc ioremap > - > /* > * Convert a physical pointer to a virtual kernel pointer for /dev/mem > * access > diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_6= 4.h > index 9303270b22f3..d8ee1442f303 100644 > --- a/arch/sparc/include/asm/io_64.h > +++ b/arch/sparc/include/asm/io_64.h > @@ -423,7 +423,6 @@ static inline void __iomem *ioremap(unsigned long off= set, unsigned long size) > return (void __iomem *)offset; > } > =20 > -#define ioremap_uc(X,Y) ioremap((X),(Y)) > #define ioremap_wc(X,Y) ioremap((X),(Y)) > #define ioremap_wt(X,Y) ioremap((X),(Y)) > static inline void __iomem *ioremap_np(unsigned long offset, unsigned lo= ng size) Acked-by: John Paul Adrian Glaubitz (SuperH) --=20 .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913