2.6.26-rc1

 kernel

diff --git a/kernel/resource.c b/kernel/resource.c
index 82aea81..74af2d7 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -131,14 +131,8 @@ static const struct file_operations proc_iomem_operations = {
 
 static int __init ioresources_init(void)
 {
-   struct proc_dir_entry *entry;
-
-   entry = create_proc_entry("ioports", 0, NULL);
-   if (entry)
-      entry->proc_fops = &proc_ioports_operations;
-   entry = create_proc_entry("iomem", 0, NULL);
-   if (entry)
-      entry->proc_fops = &proc_iomem_operations;
+   proc_create("ioports", 0, NULL, &proc_ioports_operations);
+   proc_create("iomem", 0, NULL, &proc_iomem_operations);
    return 0;
 }
 __initcall(ioresources_init);
@@ -486,6 +480,24 @@ int adjust_resource(struct resource *res, resource_size_t start, resource_size_t
 
 EXPORT_SYMBOL(adjust_resource);
 
+/**
+ * resource_alignment - calculate resource's alignment
+ * @res: resource pointer
+ *
+ * Returns alignment on success, 0 (invalid alignment) on failure.
+ */
+resource_size_t resource_alignment(struct resource *res)
+{
+   switch (res->flags & (IORESOURCE_SIZEALIGN | IORESOURCE_STARTALIGN)) {
+   case IORESOURCE_SIZEALIGN:
+      return res->end - res->start + 1;
+   case IORESOURCE_STARTALIGN:
+      return res->start;
+   default:
+      return 0;
+   }
+}
+
 /*
  * This is compatibility stuff for IO resources.
  *