Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 32c385ef1011..0f62f4672754 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -58,7 +58,7 @@ int register_trapped_io(struct trapped_io *tiop)
 
         for (k = 0; k < tiop->num_resources; k++) {
                 res = tiop->resource + k;
-                len += roundup((res->end - res->start) + 1, PAGE_SIZE);
+                len += roundup(resource_size(res), PAGE_SIZE);
                 flags |= res->flags;
         }
 
@@ -85,7 +85,7 @@ int register_trapped_io(struct trapped_io *tiop)
                        (unsigned long)(tiop->virt_base + len),
                        res->flags & IORESOURCE_IO ? "io" : "mmio",
                        (unsigned long)res->start);
-                len += roundup((res->end - res->start) + 1, PAGE_SIZE);
+                len += roundup(resource_size(res), PAGE_SIZE);
         }
 
         tiop->magic = IO_TRAPPED_MAGIC;
@@ -128,7 +128,7 @@ void __iomem *match_trapped_io_handler(struct list_head *list,
                                 return tiop->virt_base + voffs;
                         }
 
-                        len = (res->end - res->start) + 1;
+                        len = resource_size(res);
                         voffs += roundup(len, PAGE_SIZE);
                 }
         }
@@ -173,7 +173,7 @@ static unsigned long lookup_address(struct trapped_io *tiop,
 
         for (k = 0; k < tiop->num_resources; k++) {
                 res = tiop->resource + k;
-                len = roundup((res->end - res->start) + 1, PAGE_SIZE);
+                len = roundup(resource_size(res), PAGE_SIZE);
                 if (address < (vaddr + len))
                         return res->start + (address - vaddr);
                 vaddr += len;
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c
index e2a3af31ff99..c5a33f007f88 100644
--- a/arch/sh/kernel/machine_kexec.c
+++ b/arch/sh/kernel/machine_kexec.c
@@ -170,7 +170,7 @@ void __init reserve_crashkernel(void)
         if (crashk_res.end == crashk_res.start)
                 goto disable;
 
-        crash_size = PAGE_ALIGN(crashk_res.end - crashk_res.start + 1);
+        crash_size = PAGE_ALIGN(resource_size(&crashk_res));
         if (!crashk_res.start) {
                 unsigned long max = memblock_end_of_DRAM() - memory_limit;
                 crashk_res.start = __memblock_alloc_base(crash_size, PAGE_SIZE, max);