1. 24 Dec, 2012 11 commits
    • Stephen Warren's avatar
      ARM: delete struct sys_timer · 6bb27d73
      Stephen Warren authored
      Now that the only field in struct sys_timer is .init, delete the struct,
      and replace the machine descriptor .timer field with the initialization
      function itself.
      
      This will enable moving timer drivers into drivers/clocksource without
      having to place a public prototype of each struct sys_timer object into
      include/linux; the intent is to create a single of_clocksource_init()
      function that determines which timer driver to initialize by scanning
      the device dtree, much like the proposed irqchip_init() at:
      http://www.spinics.net/lists/arm-kernel/msg203686.html
      
      Includes mach-omap2 fixes from Igor Grinberg.
      Tested-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      6bb27d73
    • Stephen Warren's avatar
      ARM: remove struct sys_timer suspend and resume fields · 7704c095
      Stephen Warren authored
      These fields duplicate e.g. struct clock_event_device's suspend and
      resume fields, so remove them now that nothing is using them. The aim
      is to remove all fields from struct sys_timer except .init, then replace
      the ARM machine descriptor's .timer field with a .init_time function
      instead, and delete struct sys_timer.
      Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      7704c095
    • Stephen Warren's avatar
      ARM: samsung: register syscore_ops for timer resume directly · 656c669b
      Stephen Warren authored
      Instead of using struct sys_timer's resume function, register syscore_ops
      directly in s3c2410_timer_init(). This will allow the sys_timer suspend/
      resume fields to be removed, and eventually lead to a complete removal of
      struct sys_timer.
      
      Cc: Ben Dooks <ben-linux@fluff.org>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      656c669b
    • Stephen Warren's avatar
      ARM: ux500: convert timer suspend/resume to clock_event_device · 8726e96f
      Stephen Warren authored
      Move ux500's timer suspend/resume functions from struct sys_timer
      ux500_timer into struct clock_event_device nmdk_clkevt. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      
      Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
      Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      8726e96f
    • Stephen Warren's avatar
      ARM: sa1100: convert timer suspend/resume to clock_event_device · e3cbfb62
      Stephen Warren authored
      Move sa1100's timer suspend/resume functions from struct sys_timer
      sa1100_timer into struct clock_event_device ckevt_sa1100_osmr0. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      e3cbfb62
    • Stephen Warren's avatar
      ARM: pxa: convert timer suspend/resume to clock_event_device · 5b30d5bf
      Stephen Warren authored
      Move PXA's timer suspend/resume functions from struct sys_timer
      pxa_timer into struct clock_event_device ckevt_pxa_osmr0. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
      Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      5b30d5bf
    • Stephen Warren's avatar
      ARM: at91: convert timer suspend/resume to clock_event_device · 49356ae9
      Stephen Warren authored
      Move at91's timer suspend/resume functions from struct sys_timer
      at91sam926x_timer into struct clock_event_device pit_clkevt. This
      will allow the sys_timer suspend/resume fields to be removed, and
      eventually lead to a complete removal of struct sys_timer.
      
      Cc: Andrew Victor <linux@maxim.org.za>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      49356ae9
    • Stephen Warren's avatar
      ARM: set arch_gettimeoffset directly · 23c197b7
      Stephen Warren authored
      remove ARM's struct sys_timer .offset function pointer, and instead
      directly set the arch_gettimeoffset function pointer when the timer
      driver is initialized. This requires multiplying all function results
      by 1000, since the removed arm_gettimeoffset() did this. Also,
      s/unsigned long/u32/ just to make the function prototypes exactly
      match that of arch_gettimeoffset.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Andrew Victor <linux@maxim.org.za>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
      Cc: Hartley Sweeten <hsweeten@visionengravers.com>
      Cc: Ryan Mallon <rmallon@gmail.com>
      Cc: Ben Dooks <ben-linux@fluff.org>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      23c197b7
    • Stephen Warren's avatar
      m68k: set arch_gettimeoffset directly · c8d5ba18
      Stephen Warren authored
      remove m68k's mach_gettimeoffset function pointer, and instead directly
      set the arch_gettimeoffset function pointer. This requires multiplying
      all function results by 1000, since the removed m68k_gettimeoffset() did
      this. Also, s/unsigned long/u32/ just to make the function prototypes
      exactly match that of arch_gettimeoffset.
      
      Cc: Joshua Thompson <funaho@jurai.org>
      Cc: Sam Creasey <sammy@sammy.net>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarPhil Blundell <philb@gnu.org>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      c8d5ba18
    • Stephen Warren's avatar
      time: convert arch_gettimeoffset to a pointer · 7b1f6207
      Stephen Warren authored
      Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
      arch core provides a single implementation of arch_gettimeoffset(). In
      many cases, different sub-architectures, different machines, or
      different timer providers exist, and so the arch ends up implementing
      arch_gettimeoffset() as a call-through-pointer anyway. Examples are
      ARM, Cris, M68K, and it's arguable that the remaining architectures,
      M32R and Blackfin, should be doing this anyway.
      
      Modify arch_gettimeoffset so that it itself is a function pointer, which
      the arch initializes. This will allow later changes to move the
      initialization of this function into individual machine support or timer
      drivers. This is particularly useful for code in drivers/clocksource
      which should rely on an arch-independant mechanism to register their
      implementation of arch_gettimeoffset().
      
      This patch also converts the Cris architecture to set arch_gettimeoffset
      directly to the final implementation in time_init(), because Cris already
      had separate time_init() functions per sub-architecture. M68K and ARM
      are converted to set arch_gettimeoffset to the final implementation in
      later patches, because they already have function pointers in place for
      this purpose.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Mike Frysinger <vapier@gentoo.org>
      Cc: Mikael Starvik <starvik@axis.com>
      Cc: Hirokazu Takata <takata@linux-m32r.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      7b1f6207
    • Stephen Warren's avatar
      cris: move usec/nsec conversion to do_slow_gettimeoffset · 547046f2
      Stephen Warren authored
      Move usec to nsec conversion from arch_gettimeoffset() to
      do_slow_gettimeoffset(); in a future patch, do_slow_gettimeoffset()
      will be used directly as the implementation of arch_gettimeoffset(),
      so needs to perform all required calculations.
      
      Cc: Mikael Starvik <starvik@axis.com>
      Cc: linux-cris-kernel@axis.com
      Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      547046f2
  2. 22 Dec, 2012 8 commits
    • Linus Torvalds's avatar
      Linux 3.8-rc1 · a49f0d1e
      Linus Torvalds authored
      a49f0d1e
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 4fe19a13
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This includes some fixes and code improvements (like
        clk_prepare_enable and clk_disable_unprepare), conversion from the
        omap_wdt and twl4030_wdt drivers to the watchdog framework, addition
        of the SB8x0 chipset support and the DA9055 Watchdog driver and some
        OF support for the davinci_wdt driver."
      
      * git://www.linux-watchdog.org/linux-watchdog: (22 commits)
        watchdog: mei: avoid oops in watchdog unregister code path
        watchdog: Orion: Fix possible null-deference in orion_wdt_probe
        watchdog: sp5100_tco: Add SB8x0 chipset support
        watchdog: davinci_wdt: add OF support
        watchdog: da9052: Fix invalid free of devm_ allocated data
        watchdog: twl4030_wdt: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
        watchdog: remove depends on CONFIG_EXPERIMENTAL
        watchdog: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
        watchdog: DA9055 Watchdog driver
        watchdog: omap_wdt: eliminate goto
        watchdog: omap_wdt: delete redundant platform_set_drvdata() calls
        watchdog: omap_wdt: convert to devm_ functions
        watchdog: omap_wdt: convert to new watchdog core
        watchdog: WatchDog Timer Driver Core: fix comment
        watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare
        watchdog: imx2_wdt: Select the driver via ARCH_MXC
        watchdog: cpu5wdt.c: add missing del_timer call
        watchdog: hpwdt.c: Increase version string
        watchdog: Convert twl4030_wdt to watchdog core
        davinci_wdt: preparation for switch to common clock framework
        ...
      4fe19a13
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 769cb858
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "Misc small cifs fixes"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: eliminate cifsERROR variable
        cifs: don't compare uniqueids in cifs_prime_dcache unless server inode numbers are in use
        cifs: fix double-free of "string" in cifs_parse_mount_options
      769cb858
    • Linus Torvalds's avatar
      Merge tag 'dm-3.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm · b49249d1
      Linus Torvalds authored
      Pull dm update from Alasdair G Kergon:
       "Miscellaneous device-mapper fixes, cleanups and performance
        improvements.
      
        Of particular note:
         - Disable broken WRITE SAME support in all targets except linear and
           striped.  Use it when kcopyd is zeroing blocks.
         - Remove several mempools from targets by moving the data into the
           bio's new front_pad area(which dm calls 'per_bio_data').
         - Fix a race in thin provisioning if discards are misused.
         - Prevent userspace from interfering with the ioctl parameters and
           use kmalloc for the data buffer if it's small instead of vmalloc.
         - Throttle some annoying error messages when I/O fails."
      
      * tag 'dm-3.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: (36 commits)
        dm stripe: add WRITE SAME support
        dm: remove map_info
        dm snapshot: do not use map_context
        dm thin: dont use map_context
        dm raid1: dont use map_context
        dm flakey: dont use map_context
        dm raid1: rename read_record to bio_record
        dm: move target request nr to dm_target_io
        dm snapshot: use per_bio_data
        dm verity: use per_bio_data
        dm raid1: use per_bio_data
        dm: introduce per_bio_data
        dm kcopyd: add WRITE SAME support to dm_kcopyd_zero
        dm linear: add WRITE SAME support
        dm: add WRITE SAME support
        dm: prepare to support WRITE SAME
        dm ioctl: use kmalloc if possible
        dm ioctl: remove PF_MEMALLOC
        dm persistent data: improve improve space map block alloc failure message
        dm thin: use DMERR_LIMIT for errors
        ...
      b49249d1
    • J. Bruce Fields's avatar
      Revert "nfsd: warn on odd reply state in nfsd_vfs_read" · 10532b56
      J. Bruce Fields authored
      This reverts commit 79f77bf9.
      
      This is obviously wrong, and I have no idea how I missed seeing the
      warning in testing: I must just not have looked at the right logs.  The
      caller bumps rq_resused/rq_next_page, so it will always be hit on a
      large enough read.
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      10532b56
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 184e2516
      Linus Torvalds authored
      Pull more infiniband changes from Roland Dreier:
       "Second batch of InfiniBand/RDMA changes for 3.8:
         - cxgb4 changes to fix lookup engine hash collisions
         - mlx4 changes to make flow steering usable
         - fix to IPoIB to avoid pinning dst reference for too long"
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/cxgb4: Fix bug for active and passive LE hash collision path
        RDMA/cxgb4: Fix LE hash collision bug for passive open connection
        RDMA/cxgb4: Fix LE hash collision bug for active open connection
        mlx4_core: Allow choosing flow steering mode
        mlx4_core: Adjustments to Flow Steering activation logic for SR-IOV
        mlx4_core: Fix error flow in the flow steering wrapper
        mlx4_core: Add QPN enforcement for flow steering rules set by VFs
        cxgb4: Add LE hash collision bug fix path in LLD driver
        cxgb4: Add T4 filter support
        IPoIB: Call skb_dst_drop() once skb is enqueued for sending
      184e2516
    • Linus Torvalds's avatar
      Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · 0264405b
      Linus Torvalds authored
      Pull asm-generic cleanup from Arnd Bergmann:
       "These are a few cleanups for asm-generic:
      
         - a set of patches from Lars-Peter Clausen to generalize asm/mmu.h
           and use it in the architectures that don't need any special
           handling.
         - A patch from Will Deacon to remove the {read,write}s{b,w,l} as
           discussed during the arm64 review
         - A patch from James Hogan that helps with the meta architecture
           series."
      
      * tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        xtensa: Use generic asm/mmu.h for nommu
        h8300: Use generic asm/mmu.h
        c6x: Use generic asm/mmu.h
        asm-generic/mmu.h: Add support for FDPIC
        asm-generic/mmu.h: Remove unused vmlist field from mm_context_t
        asm-generic: io: remove {read,write} string functions
        asm-generic/io.h: remove asm/cacheflush.h include
      0264405b
    • Kukjin Kim's avatar
      ARM: dts: fix duplicated build target and alphabetical sort out for exynos · 7e65df38
      Kukjin Kim authored
      Commit db5b0ae0 ("Merge tag 'dt' of git://git.kernel.org/.../arm-soc")
      causes a duplicated build target.  This patch fixes it and sorts out the
      build target alphabetically so that we can recognize something wrong
      easily.
      
      Cc: Olof Johansson <olof@lixom.net>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7e65df38
  3. 21 Dec, 2012 21 commits