1. 28 Mar, 2012 3 commits
  2. 27 Mar, 2012 12 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · de8856d2
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       1) Name string overrun fix in gianfar driver from Joe Perches.
      
       2) VHOST bug fixes from Michael S. Tsirkin and Nadav Har'El
      
       3) Fix dependencies on xt_LOG netfilter module, from Pablo Neira Ayuso.
      
       4) Fix RCU locking in xt_CT, also from Pablo Neira Ayuso.
      
       5) Add a parameter to skb_add_rx_frag() so we can fix the truesize
          adjustments in the drivers that use it.  The individual drivers
          aren't fixed by this commit, but will be dealt with using follow-on
          commits.  From Eric Dumazet.
      
       6) Add some device IDs to qmi_wwan driver, from Andrew Bird.
      
       7) Fix a potential rcu_read_lock() imbalancein rt6_fill_node().  From
          Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()
        net: add a truesize parameter to skb_add_rx_frag()
        gianfar: Fix possible overrun and simplify interrupt name field creation
        USB: qmi_wwan: Add ZTE (Vodafone) K3570-Z and K3571-Z net interfaces
        USB: option: Ignore ZTE (Vodafone) K3570/71 net interfaces
        USB: qmi_wwan: Add ZTE (Vodafone) K3565-Z and K4505-Z net interfaces
        qlcnic: Bug fix for LRO
        netfilter: nf_conntrack: permanently attach timeout policy to conntrack
        netfilter: xt_CT: fix assignation of the generic protocol tracker
        netfilter: xt_CT: missing rcu_read_lock section in timeout assignment
        netfilter: cttimeout: fix dependency with l4protocol conntrack module
        netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6
        vhost: fix release path lockdep checks
        vhost: don't forget to schedule()
        tools/virtio: stub out strong barriers
        tools/virtio: add linux/hrtimer.h stub
        tools/virtio: add linux/module.h stub
      de8856d2
    • Linus Torvalds's avatar
      Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 66f03c61
      Linus Torvalds authored
      Pull "ARM: device tree work" from Arnd Bergmann:
       "Most of these patches convert code from using static platform data to
        describing the hardware in the device tree.  This is only the first
        half of the changes for v3.4 because a lot of patches for this topic
        came in the last week before the merge window.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      Fix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}
      
      * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)
        Document: devicetree: add OF documents for arch-mmp
        ARM: dts: append DTS file of pxa168
        ARM: mmp: append OF support on pxa168
        ARM: mmp: enable rtc clk in pxa168
        i2c: pxa: add OF support
        serial: pxa: add OF support
        arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board
        ARM: OMAP2+: Remove extra ifdefs for board-generic
        ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
        ASoC: DT: Add digital microphone binding to PAZ00 board.
        ARM: dt: Add ARM PMU to tegra*.dtsi
        ARM: at91: at91sam9x5cm/dt: add leds support
        ARM: at91: usb_a9g20/dt: add gpio-keys support
        ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support
        ARM: at91: at91sam9m10g45ek/dt: add leds support
        ARM: at91: usb_a9g20/dt: add leds support
        ARM: at91/pio: add new PIO3 features
        ARM: at91: add sam9_smc.o to at91sam9x5 build
        ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter
        ARM: at91/tc: add device tree support to atmel_tclib
        ...
      66f03c61
    • Linus Torvalds's avatar
      Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 34800598
      Linus Torvalds authored
      Pull "ARM: driver specific updates" from Arnd Bergmann:
       "These are all specific to some driver.  They are typically the
        platform side of a change in the drivers directory, such as adding a
        new driver or extending the interface to the platform.  In cases where
        there is no maintainer for the driver, or the maintainer prefers to
        have the platform changes in the same branch as the driver changes,
        the patches to the drivers are included as well.
      
        A much smaller set of driver updates that depend on other branches
        getting merged first will be sent later.
      
        The new export of tegra_chip_uid conflicts with other changes in
        fuse.c.  In rtc-sa1100.c, the global removal of IRQF_DISABLED
        conflicts with the cleanup of the interrupt handling of that driver.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      Fixed up aforementioned trivial conflicts.
      
      * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
        ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
        mmc: sdhci-s3c: add platform data for the second capability
        ARM: SAMSUNG: support the second capability for samsung-soc
        ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
        ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
        ARM: EXYNOS: Enable MDMA driver
        regulator: Remove bq24022 regulator driver
        rtc: sa1100: add OF support
        pxa: magician/hx4700: Convert to gpio-regulator from bq24022
        ARM: OMAP3+: SmartReflex: fix error handling
        ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
        ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
        ARM: OMAP3+: SmartReflex: misc cleanups
        ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
        ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
        ARM: OMAP3+: hwmod: add SmartReflex IRQs
        ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
        ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
        ARM: OMAP3+: SmartReflex: Add a shutdown hook
        ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
        ...
      
      Conflicts:
      	arch/arm/mach-tegra/Makefile
      	arch/arm/mach-tegra/fuse.c
      	drivers/rtc/rtc-sa1100.c
      34800598
    • Linus Torvalds's avatar
      Merge tag 'rpmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 46b407ca
      Linus Torvalds authored
      Pull "remoteproc/rpmsg: new subsystem" from Arnd Bergmann:
       "This new subsystem provides a common way to talk to secondary
        processors on an SoC, e.g.  a DSP, GPU or service processor, using
        virtio as the transport.  In the long run, it should replace a few
        dozen vendor specific ways to do the same thing, which all never made
        it into the upstream kernel.  There is a broad agreement that rpmsg is
        the way to go here and several vendors have started working on
        replacing their own subsystems.
      
        Two branches each add one virtio protocol number.  Fortunately the
        numbers were agreed upon in advance, so there are only context
        changes.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      Fixed up trivial protocol number conflict due to the mentioned additions
      next to each other.
      
      * tag 'rpmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
        remoteproc: cleanup resource table parsing paths
        remoteproc: remove the hardcoded vring alignment
        remoteproc/omap: remove the mbox_callback limitation
        remoteproc: remove the single rpmsg vdev limitation
        remoteproc: safer boot/shutdown order
        remoteproc: remoteproc_rpmsg -> remoteproc_virtio
        remoteproc: resource table overhaul
        rpmsg: fix build warning when dma_addr_t is 64-bit
        rpmsg: fix published buffer length in rpmsg_recv_done
        rpmsg: validate incoming message length before propagating
        rpmsg: fix name service endpoint leak
        remoteproc/omap: two Kconfig fixes
        remoteproc: make sure we're parsing a 32bit firmware
        remoteproc: s/big switch/lookup table/
        remoteproc: bail out if firmware has different endianess
        remoteproc: don't use virtio's weak barriers
        rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
        rpmsg: depend on EXPERIMENTAL
        remoteproc: depend on EXPERIMENTAL
        rpmsg: add Kconfig menu
        ...
      
      Conflicts:
      	include/linux/virtio_ids.h
      46b407ca
    • Linus Torvalds's avatar
      Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1bfecd93
      Linus Torvalds authored
      Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson:
       "These changes are all specific to one board only.  We're trying to
        keep the number of board files low, but generally board level updates
        are ok on platforms that are working on moving towards DT based
        probing, which will eventually lead to removing them.
      
        The board-ams-delta.c board file gets a conflict between the removal
        of ams_delta_config and the addition of a lot of other data.  The
        Kconfig file has two changes in the same line, and in exynos, the
        power domain cleanup conflicts with the addition of the image sensor
        device.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
        [olof: Amended a fix for a mismerge to board-omap4panda.c]
        Signed-off-by: Olof Johansson <olof@lixom.net>"
      
      Fixed up some fairly trivial conflicts manually.
      
      * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)
        i.MX35-PDK: Add Camera support
        ARM : mx35: 3ds-board: add framebuffer device
        pxa/hx4700: Remove pcmcia platform_device structure
        ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
        ARM: pxa/hx4700: Remove unwanted request for GPIO105
        ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
        ARM: EXYNOS: Register JPEG on nuri
        ARM: EXYNOS: Register JPEG on universal_c210
        ARM: S5PV210: Enable JPEG on SMDKV210
        ARM: S5PV210: Add JPEG board definition
        ARM: EXYNOS: Enable JPEG on Origen
        ARM: EXYNOS: Enable JPEG on SMDKV310
        ARM: EXYNOS: Add __init attribute to universal_camera_init()
        ARM: EXYNOS: Add __init attribute to nuri_camera_init()
        ARM: S5PV210: Enable FIMC on SMDKC110
        ARM: S5PV210: Enable FIMC on SMDKV210
        ARM: S5PV210: Enable MFC on SMDKC110
        ARM: S5PV210: Enable MFC on SMDKV210
        ARM: EXYNOS: Enable G2D on SMDKV310
        ARM: tegra: update defconfig
        ...
      1bfecd93
    • Linus Torvalds's avatar
      Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 281b0539
      Linus Torvalds authored
      Pull "ARM: SoC specific updates" from Arnd Bergmann:
       "These changes are all specific to an soc family or the code for one
        soc.  Lots of work for Tegra3 this time, but also a lot of other
        platforms.  There will be another (smaller) set of soc patches later
        in the merge window for stuff that has dependencies on external trees
        or that was sent just before the merge window opened.
      
        The asoc tree added a few devices to the i.mx platform, which conflict
        with other devices added in the same place here.
      
        The tegra Makefile conflicts between a number of branches, mostly
        because of changes regarding localtimer.c, which was removed in the
        end.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      Fix up some trivial conflicts, including the mentioned Tegra Makefile.
      
      * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
        ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
        ARM: EXYNOS: add support JPEG
        ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
        ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
        ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
        ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
        ARM: S5PV210: Add usb otg phy control
        ARM: S3C64XX: Add usb otg phy control
        ARM: EXYNOS: Enable l2 configuration through device tree
        ARM: EXYNOS: remove useless code to save/restore L2
        ARM: EXYNOS: save L2 settings during bootup
        ARM: S5P: add L2 early resume code
        ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
        ARM: mx35: Setup the AIPS registers
        ARM: mx5: Use common function for configuring AIPS
        ARM: mx3: Setup AIPS registers
        ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
        ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
        ARM: imx: update imx_v6_v7_defconfig
        ARM: tegra: Demote EMC clock inconsistency BUG to WARN
        ...
      281b0539
    • Linus Torvalds's avatar
      Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 48d55441
      Linus Torvalds authored
      Pull "ARM: timer cleanup work" from Arnd Bergmann:
       "These are split out from the generic soc and driver updates because
        there was a lot of conflicting work by multiple people.  Marc Zyngier
        worked on simplifying the "localtimer" interfaces, and some of the
        platforms are touching the same code as they move to device tree based
        booting.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      * tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
        ARM: tegra: select USB_ULPI if USB is selected
        arm/tegra: pcie: fix return value of function
        ARM: ux500: fix compilation after local timer rework
        ARM: shmobile: remove additional __io() macro use
        ARM: local timers: make the runtime registration interface mandatory
        ARM: local timers: convert MSM to runtime registration interface
        ARM: local timers: convert exynos to runtime registration interface
        ARM: smp_twd: remove old local timer interface
        ARM: imx6q: convert to twd_local_timer_register() interface
        ARM: highbank: convert to twd_local_timer_register() interface
        ARM: ux500: convert to twd_local_timer_register() interface
        ARM: shmobile: convert to twd_local_timer_register() interface
        ARM: tegra: convert to twd_local_timer_register() interface
        ARM: plat-versatile: convert to twd_local_timer_register() interface
        ARM: OMAP4: convert to twd_local_timer_register() interface
        ARM: smp_twd: add device tree support
        ARM: smp_twd: add runtime registration support
        ARM: local timers: introduce a new registration interface
        ARM: smp_twd: make local_timer_stop a symbol instead of a #define
        ARM: mach-shmobile: default to no earlytimer
        ...
      48d55441
    • Linus Torvalds's avatar
      Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d61b7a57
      Linus Torvalds authored
      Pull "ARM: global cleanups" from Arnd Bergmann:
       "Quite a bit of code gets removed, and some stuff moved around, mostly
        the old samsung s3c24xx stuff.  There should be no functional changes
        in this series otherwise.  Some cleanups have dependencies on other
        arm-soc branches and will be sent in the second round.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      Fixed up trivial conflicts mainly due to #include's being changes on
      both sides.
      
      * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)
        ep93xx: Remove unnecessary includes of ep93xx-regs.h
        ep93xx: Move EP93XX_SYSCON defines to SoC private header
        ep93xx: Move crunch code to mach-ep93xx directory
        ep93xx: Make syscon access functions private to SoC
        ep93xx: Configure GPIO ports in core code
        ep93xx: Move peripheral defines to local SoC header
        ep93xx: Convert the watchdog driver into a platform device.
        ep93xx: Use ioremap for backlight driver
        ep93xx: Move GPIO defines to gpio-ep93xx.h
        ep93xx: Don't use system controller defines in audio drivers
        ep93xx: Move PHYS_BASE defines to local SoC header file
        ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
        ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
        PM / devfreq: update the name of EXYNOS clock registers that were omitted
        PM / devfreq: update the name of EXYNOS clock register
        ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
        ARM: EXYNOS: use static declaration on regarding clock
        ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
        ARM: OMAP2+: Fix build error after merge
        ARM: S3C24XX: remove call to s3c24xx_setup_clocks
        ...
      d61b7a57
    • Linus Torvalds's avatar
      Merge tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 18d9946b
      Linus Torvalds authored
      Pull "ARM: subarch maintainer updates" from Arnd Bergmann:
       "This is a collection of updates to the MAINTAINERS file, separated out
        mostly to give an overview of what has changed regarding who does
        what.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      * tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: tegra: update main repo and add patchwork
        MAINTAINERS: update MAINTAINERS email entry
        MAINTAINERS: update maintainer entry for pxa/hx4700
        MAINTAINERS: ARM: tegra: update Stephen's email address
        MAINTAINERS: add TI DaVinci git tree information
        MAINTAINERS: mark TI DaVinci list as "moderated"
        MAINTAINERS: remove arch/arm/mach-mx*/ from IMX entry
      18d9946b
    • Linus Torvalds's avatar
      Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c8bc5e39
      Linus Torvalds authored
      Pull "ARM: Non-critical bug fixes" from Ardn Bergmann:
       "Simple bug fixes that were not considered important enough for
        inclusion into 3.3.  One bug fix was originally intended for 3.3 but
        accidentally got missed, but is not marked stable because it should
        only get backported once later fixes also make it into v3.4.
      
        Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
      
      * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (66 commits)
        iomux-mx25.h slew rate adjusted for LCD __LD pins
        ARM: davinci: DA850: move da850_register_pm to .init.text
        ARM: davinci: cpufreq: fix compiler warning
        ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h
        ARM: OMAP2+: Fix section warnings for hsmmc_init_one
        ARM: OMAP2+: Fix build issues with missing include of linux/bug.h
        ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance
        ARM: OMAP3+: PM: VP: fix integer truncation error
        ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled
        ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()
        ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set
        ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected
        ARM: OMAP1: Fix section mismatch for omap1_init_early()
        ARM: OMAP1: Fix typo in lcd_dma.c
        ARM: OMAP: mailbox: trivial whitespace fix
        ARM: OMAP: Remove definition cpu_is_omap4430()
        ARM: OMAP2+: included some headers twice
        ARM: OMAP: clock.c: included linux/debugfs.h twice
        ARM: OMAP: don't build hwspinlock in vain
        ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's provided
        ...
      c8bc5e39
    • Eric Dumazet's avatar
      net: fix a potential rcu_read_lock() imbalance in rt6_fill_node() · 94f826b8
      Eric Dumazet authored
      Commit f2c31e32 (net: fix NULL dereferences in check_peer_redir() )
      added a regression in rt6_fill_node(), leading to rcu_read_lock()
      imbalance.
      
      Thats because NLA_PUT() can make a jump to nla_put_failure label.
      
      Fix this by using nla_put()
      
      Many thanks to Ben Greear for his help
      Reported-by: default avatarBen Greear <greearb@candelatech.com>
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Tested-by: default avatarBen Greear <greearb@candelatech.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      94f826b8
    • Arnd Bergmann's avatar
      Merge tag 'asoc-3.4' of... · a754a87c
      Arnd Bergmann authored
      Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
      
      The asoc branch that was already merged into v3.4 contains some
      board-level changes that conflict with patches we already have
      here, so pull in that branch to resolve the conflicts.
      
      Conflicts:
      	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
      	arch/arm/mach-omap2/board-omap4panda.c
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: Amended fix for mismerge as reported by Kevin Hilman]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a754a87c
  3. 26 Mar, 2012 12 commits
  4. 25 Mar, 2012 5 commits
  5. 24 Mar, 2012 8 commits
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.4-tag-two' of... · e22057c8
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull more xen updates from Konrad Rzeszutek Wilk:
       "One tiny feature that accidentally got lost in the initial git pull:
         * Add fast-EOI acking of interrupts (clear a bit instead of
           hypercall)
        And bug-fixes:
         * Fix CPU bring-up code missing a call to notify other subsystems.
         * Fix reading /sys/hypervisor even if PVonHVM drivers are not loaded.
         * In Xen ACPI processor driver: remove too verbose WARN messages, fix
           up the Kconfig dependency to be a module by default, and add
           dependency on CPU_FREQ.
         * Disable CPU frequency drivers from loading when booting under Xen
           (as we want the Xen ACPI processor to be used instead).
         * Cleanups in tmem code."
      
      * tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/acpi: Fix Kconfig dependency on CPU_FREQ
        xen: initialize platform-pci even if xen_emul_unplug=never
        xen/smp: Fix bringup bug in AP code.
        xen/acpi: Remove the WARN's as they just create noise.
        xen/tmem: cleanup
        xen: support pirq_eoi_map
        xen/acpi-processor: Do not depend on CPU frequency scaling drivers.
        xen/cpufreq: Disable the cpu frequency scaling drivers from loading.
        provide disable_cpufreq() function to disable the API.
      e22057c8
    • Rik van Riel's avatar
      Fix potential endless loop in kswapd when compaction is not enabled · 496b919b
      Rik van Riel authored
      We should only test compaction_suitable if the kernel is built with
      CONFIG_COMPACTION, otherwise the stub compaction_suitable function will
      always return COMPACT_SKIPPED and send kswapd into an infinite loop.
      Reported-by: default avatarAnton Blanchard <anton@samba.org>
      Signed-off-by: default avatarRik van Riel <riel@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      496b919b
    • Linus Torvalds's avatar
      Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 250f6715
      Linus Torvalds authored
      Pull <linux/device.h> avoidance patches from Paul Gortmaker:
       "Nearly every subsystem has some kind of header with a proto like:
      
      	void foo(struct device *dev);
      
        and yet there is no reason for most of these guys to care about the
        sub fields within the device struct.  This allows us to significantly
        reduce the scope of headers including headers.  For this instance, a
        reduction of about 40% is achieved by replacing the include with the
        simple fact that the device is some kind of a struct.
      
        Unlike the much larger module.h cleanup, this one is simply two
        commits.  One to fix the implicit <linux/device.h> users, and then one
        to delete the device.h includes from the linux/include/ dir wherever
        possible."
      
      * tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
        device.h: audit and cleanup users in main include dir
        device.h: cleanup users outside of linux/include (C files)
      250f6715
    • Linus Torvalds's avatar
      Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 11bcb328
      Linus Torvalds authored
      Pull cleanup of fs/ and lib/ users of module.h from Paul Gortmaker:
       "Fix up files in fs/ and lib/ dirs to only use module.h if they really
        need it.
      
        These are trivial in scope vs the work done previously.  We now have
        things where any few remaining cleanups can be farmed out to arch or
        subsystem maintainers, and I have done so when possible.  What is
        remaining here represents the bits that don't clearly lie within a
        single arch/subsystem boundary, like the fs dir and the lib dir.
      
        Some duplicate includes arising from overlapping fixes from
        independent subsystem maintainer submissions are also quashed."
      
      Fix up trivial conflicts due to clashes with other include file cleanups
      (including some due to the previous bug.h cleanup pull).
      
      * tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
        lib: reduce the use of module.h wherever possible
        fs: reduce the use of module.h wherever possible
        includecheck: delete any duplicate instances of module.h
      11bcb328
    • Linus Torvalds's avatar
      Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · ed2d265d
      Linus Torvalds authored
      Pull <linux/bug.h> cleanup from Paul Gortmaker:
       "The changes shown here are to unify linux's BUG support under the one
        <linux/bug.h> file.  Due to historical reasons, we have some BUG code
        in bug.h and some in kernel.h -- i.e.  the support for BUILD_BUG in
        linux/kernel.h predates the addition of linux/bug.h, but old code in
        kernel.h wasn't moved to bug.h at that time.  As a band-aid, kernel.h
        was including <asm/bug.h> to pseudo link them.
      
        This has caused confusion[1] and general yuck/WTF[2] reactions.  Here
        is an example that violates the principle of least surprise:
      
            CC      lib/string.o
            lib/string.c: In function 'strlcat':
            lib/string.c:225:2: error: implicit declaration of function 'BUILD_BUG_ON'
            make[2]: *** [lib/string.o] Error 1
            $
            $ grep linux/bug.h lib/string.c
            #include <linux/bug.h>
            $
      
        We've included <linux/bug.h> for the BUG infrastructure and yet we
        still get a compile fail! [We've not kernel.h for BUILD_BUG_ON.] Ugh -
        very confusing for someone who is new to kernel development.
      
        With the above in mind, the goals of this changeset are:
      
        1) find and fix any include/*.h files that were relying on the
           implicit presence of BUG code.
        2) find and fix any C files that were consuming kernel.h and hence
           relying on implicitly getting some/all BUG code.
        3) Move the BUG related code living in kernel.h to <linux/bug.h>
        4) remove the asm/bug.h from kernel.h to finally break the chain.
      
        During development, the order was more like 3-4, build-test, 1-2.  But
        to ensure that git history for bisect doesn't get needless build
        failures introduced, the commits have been reorderd to fix the problem
        areas in advance.
      
      	[1]  https://lkml.org/lkml/2012/1/3/90
      	[2]  https://lkml.org/lkml/2012/1/17/414"
      
      Fix up conflicts (new radeon file, reiserfs header cleanups) as per Paul
      and linux-next.
      
      * tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
        kernel.h: doesn't explicitly use bug.h, so don't include it.
        bug: consolidate BUILD_BUG_ON with other bug code
        BUG: headers with BUG/BUG_ON etc. need linux/bug.h
        bug.h: add include of it to various implicit C users
        lib: fix implicit users of kernel.h for TAINT_WARN
        spinlock: macroize assert_spin_locked to avoid bug.h dependency
        x86: relocate get/set debugreg fcns to include/asm/debugreg.
      ed2d265d
    • Konrad Rzeszutek Wilk's avatar
      xen/acpi: Fix Kconfig dependency on CPU_FREQ · df7a3ee2
      Konrad Rzeszutek Wilk authored
      The functions: "acpi_processor_*" sound like they depend on CONFIG_ACPI_PROCESSOR
      but in reality they are exposed when CONFIG_CPU_FREQ=[y|m]. As such
      update the Kconfig to have this dependency and fix compile issues:
      
      ERROR: "acpi_processor_unregister_performance" [drivers/xen/xen-acpi-processor.ko] undefined!
      ERROR: "acpi_processor_notify_smm" [drivers/xen/xen-acpi-processor.ko] undefined!
      ERROR: "acpi_processor_register_performance" [drivers/xen/xen-acpi-processor.ko] undefined!
      ERROR: "acpi_processor_preregister_performance" [drivers/xen/xen-acpi-processor.ko] undefined!
      
      Note: We still need the CONFIG_ACPI
      Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      df7a3ee2
    • Arnd Bergmann's avatar
      Merge tag 'regulator-3.4' of... · 511f1cb6
      Arnd Bergmann authored
      Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers
      
      The pxa regulator branch removes the bq24022 driver, while a lot of
      other regulator drivers got added in the regulator tree. This
      resolves the trivial conflicts by merging in the regulator patches
      that are already merged into v3.4.
      
      Conflicts:
      	drivers/regulator/Kconfig
      	drivers/regulator/Makefile
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      511f1cb6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl · f1d38e42
      Linus Torvalds authored
      Pull sysctl updates from Eric Biederman:
      
       - Rewrite of sysctl for speed and clarity.
      
         Insert/remove/Lookup in sysctl are all now O(NlogN) operations, and
         are no longer bottlenecks in the process of adding and removing
         network devices.
      
         sysctl is now focused on being a filesystem instead of system call
         and the code can all be found in fs/proc/proc_sysctl.c.  Hopefully
         this means the code is now approachable.
      
         Much thanks is owed to Lucian Grinjincu for keeping at this until
         something was found that was usable.
      
       - The recent proc_sys_poll oops found by the fuzzer during hibernation
         is fixed.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl: (36 commits)
        sysctl: protect poll() in entries that may go away
        sysctl: Don't call sysctl_follow_link unless we are a link.
        sysctl: Comments to make the code clearer.
        sysctl: Correct error return from get_subdir
        sysctl: An easier to read version of find_subdir
        sysctl: fix memset parameters in setup_sysctl_set()
        sysctl: remove an unused variable
        sysctl: Add register_sysctl for normal sysctl users
        sysctl: Index sysctl directories with rbtrees.
        sysctl: Make the header lists per directory.
        sysctl: Move sysctl_check_dups into insert_header
        sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy
        sysctl: Replace root_list with links between sysctl_table_sets.
        sysctl: Add sysctl_print_dir and use it in get_subdir
        sysctl: Stop requiring explicit management of sysctl directories
        sysctl: Add a root pointer to ctl_table_set
        sysctl: Rewrite proc_sys_readdir in terms of first_entry and next_entry
        sysctl: Rewrite proc_sys_lookup introducing find_entry and lookup_entry.
        sysctl: Normalize the root_table data structure.
        sysctl: Factor out insert_header and erase_header
        ...
      f1d38e42