← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/message/i2o/iop.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/message/i2o/iop.c
681
681
                if (root && allocate_resource(root, res, sb->desired_mem_size, sb->desired_mem_size, sb->desired_mem_size, 1 << 20,     /* Unspecified, so use 1Mb and play safe */
682
682
                                              NULL, NULL) >= 0) {
683
683
                        c->mem_alloc = 1;
684
 
                        sb->current_mem_size = 1 + res->end - res->start;
 
684
                        sb->current_mem_size = resource_size(res);
685
685
                        sb->current_mem_base = res->start;
686
686
                        osm_info("%s: allocated %llu bytes of PCI memory at "
687
687
                                "0x%016llX.\n", c->name,
688
 
                                (unsigned long long)(1 + res->end - res->start),
 
688
                                (unsigned long long)resource_size(res),
689
689
                                (unsigned long long)res->start);
690
690
                }
691
691
        }
703
703
                if (root && allocate_resource(root, res, sb->desired_io_size, sb->desired_io_size, sb->desired_io_size, 1 << 20,        /* Unspecified, so use 1Mb and play safe */
704
704
                                              NULL, NULL) >= 0) {
705
705
                        c->io_alloc = 1;
706
 
                        sb->current_io_size = 1 + res->end - res->start;
 
706
                        sb->current_io_size = resource_size(res);
707
707
                        sb->current_mem_base = res->start;
708
708
                        osm_info("%s: allocated %llu bytes of PCI I/O at "
709
709
                                "0x%016llX.\n", c->name,
710
 
                                (unsigned long long)(1 + res->end - res->start),
 
710
                                (unsigned long long)resource_size(res),
711
711
                                (unsigned long long)res->start);
712
712
                }
713
713
        }