Skip to content
  1. Jun 14, 2013
    • Thomas Petazzoni's avatar
      arm: mvebu: remove dependency of SMP init on static I/O mapping · b21dcafe
      Thomas Petazzoni authored
      
      
      The ->smp_init_cpus() function is called very early during boot, at a
      point where dynamic I/O mappings are not yet possible. However, in the
      Armada 370/XP implementation of this function, we have to get the
      number of CPUs. We used to do that by accessing a hardware register,
      which requires relying on a static I/O mapping set up by
      ->map_io(). Not only this requires hardcoding a virtual address, but
      it also prevents us from removing the static I/O mapping.
      
      So this commit changes the way used to get the number of CPUs: we now
      use the Device Tree, which is a representation of the hardware, and
      provides us the number of available CPUs. This is also more accurate,
      because it potentially allows to boot the Linux kernel on only a
      number of CPUs given by the Device Tree, instead of unconditionally on
      all CPUs.
      
      As a consequence, the coherency_get_cpu_count() function becomes no
      longer used, so we remove it.
      
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      b21dcafe
    • Jason Cooper's avatar
      Merge tag 'tags/cleanup-3.11-3' into mvebu/regmap · fdc0b43f
      Jason Cooper authored
      mvebu cleanup for v3.11 (round 3)
      
       - mvebu
          - mark functions in armada-370-xp.c as static
      fdc0b43f
    • Jason Cooper's avatar
      Merge tag 'tags/fixes-non-3.11-1' into mvebu/regmap · ad9d6156
      Jason Cooper authored
      mvebu fixes non-critical for v3.11 (round 1)
      
       - mvebu
          - fix register area length in dtsi for ethernet and sata
      ad9d6156
  2. Jun 02, 2013
    • Linus Torvalds's avatar
      Linux 3.10-rc4 · d683b96b
      Linus Torvalds authored
      d683b96b
    • Linus Torvalds's avatar
      Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · cc863973
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "This patcheset includes fixes for:
      
         - the PCI/LBA which brings back the stifb graphics framebuffer
           console
         - possible memory overflows in parisc kernel init code
         - parport support on older GSC machines
         - avoids that users by mistake enable PARPORT_PC_SUPERIO on parisc
         - MAINTAINERS file list updates for parisc."
      
      * 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: parport0: fix this legacy no-device port driver!
        parport_pc: disable PARPORT_PC_SUPERIO on parisc architecture
        parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2)
        parisc/PCI: Set type for LBA bus_num resource
        MAINTAINERS: update parisc architecture file list
        parisc: kernel: using strlcpy() instead of strcpy()
        parisc: rename "CONFIG_PA7100" to "CONFIG_PA7000"
        parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50
        parisc: memory overflow, 'name' length is too short for using
      cc863973
  3. Jun 01, 2013