Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[cascardo/linux.git] / include / linux / ioport.h

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index e885ba2..589e0e7 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -223,5 +223,12 @@ extern int
 walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
                void *arg, int (*func)(unsigned long, unsigned long, void *));
 
+/* True if any part of r1 overlaps r2 */
+static inline bool resource_overlaps(struct resource *r1, struct resource *r2)
+{
+       return (r1->start <= r2->end && r1->end >= r2->start);
+}
+
+
 #endif /* __ASSEMBLY__ */
 #endif /* _LINUX_IOPORT_H */