Merge branch 'for-3.20/core' into for-3.20/drivers

diff --cc arch/powerpc/sysdev/axonram.c
index 367533bb3d48c0e1b031e7876692c6471fbea7a1,20f8afe855d10fd0bdf2ce5797b5cf6946bf0cf2..ee90db17b0972af4ba3c085cc770786b68f51559
--- 1/arch/powerpc/sysdev/axonram.c
--- 2/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@@ -139,26 -139,17 +139,17 @@@ axon_ram_make_request(struct request_qu
   * axon_ram_direct_access - direct_access() method for block device
   * @device, @sector, @data: see block_device_operations method
   */
- static int
+ static long
  axon_ram_direct_access(struct block_device *device, sector_t sector,
-                      void **kaddr, unsigned long *pfn)
+                      void **kaddr, unsigned long *pfn, long size)
  {
        struct axon_ram_bank *bank = device->bd_disk->private_data;
-       loff_t offset;
- 
-       offset = sector;
-       if (device->bd_part != NULL)
-               offset += device->bd_part->start_sect;
-       offset <<= AXON_RAM_SECTOR_SHIFT;
-       if (offset >= bank->size) {
-               dev_err(&bank->device->dev, "Access outside of address space\n");
-               return -ERANGE;
-       }
+       loff_t offset = (loff_t)sector << AXON_RAM_SECTOR_SHIFT;
  
        *kaddr = (void *)(bank->ph_addr + offset);
 -      *pfn = virt_to_phys(kaddr) >> PAGE_SHIFT;
 +      *pfn = virt_to_phys(*kaddr) >> PAGE_SHIFT;
  
-       return 0;
+       return bank->size - offset;
  }
  
  static const struct block_device_operations axon_ram_devops = {