From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - resource-add-resource_size.patch removed from -mm tree Date: Fri, 18 Jul 2008 15:25:26 -0700 Message-ID: <200807182225.m6IMPQ1C001665@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:51911 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755718AbYGRW0T (ORCPT ); Fri, 18 Jul 2008 18:26:19 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: magnus.damm@gmail.com, damm@igel.co.jp, greg@kroah.com, mm-commits@vger.kernel.org The patch titled resource: add resource_size() has been removed from the -mm tree. Its filename was resource-add-resource_size.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: resource: add resource_size() From: Magnus Damm Avoid one-off errors by introducing a resource_size() function. Signed-off-by: Magnus Damm Cc: Greg KH Signed-off-by: Andrew Morton --- include/linux/ioport.h | 4 ++++ kernel/resource.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff -puN include/linux/ioport.h~resource-add-resource_size include/linux/ioport.h --- a/include/linux/ioport.h~resource-add-resource_size +++ a/include/linux/ioport.h @@ -118,6 +118,10 @@ extern int allocate_resource(struct reso int adjust_resource(struct resource *res, resource_size_t start, resource_size_t size); resource_size_t resource_alignment(struct resource *res); +static inline resource_size_t resource_size(struct resource *res) +{ + return res->end - res->start + 1; +} /* Convenience shorthand with allocation */ #define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name)) diff -puN kernel/resource.c~resource-add-resource_size kernel/resource.c --- a/kernel/resource.c~resource-add-resource_size +++ a/kernel/resource.c @@ -490,7 +490,7 @@ resource_size_t resource_alignment(struc { switch (res->flags & (IORESOURCE_SIZEALIGN | IORESOURCE_STARTALIGN)) { case IORESOURCE_SIZEALIGN: - return res->end - res->start + 1; + return resource_size(res); case IORESOURCE_STARTALIGN: return res->start; default: _ Patches currently in -mm which might be from magnus.damm@gmail.com are linux-next.patch video-superh-mobile-lcdc-driver.patch video-superh-mobile-lcdc-driver-update.patch resource-add-resource_size.patch resource-add-resource_size-fix.patch resource-add-resource_type-and-ioresource_type_bits.patch resource-add-resource_type-and-ioresource_type_bits-fix.patch resource-use-new-resource-type-changes.patch resource-add-new-ioresource_clk-type.patch