27 Nov, 2011

1 commit

  • Fix build failure in staging iio driver:

    .../drivers/staging/iio/industrialio-core.c: In function 'iio_event_getfd':
    .../drivers/staging/iio/industrialio-core.c:262:32: error:
    'ev_int' undeclared (first use in this function)

    Also convert the rest of the function to use the new variable.

    Signed-off-by: Andy Whitcroft
    Signed-off-by: Linus Torvalds

    Andy Whitcroft
     

23 Nov, 2011

1 commit


22 Nov, 2011

2 commits


19 Nov, 2011

4 commits

  • ET131X is a network device, so it should depend on
    NETDEVICES. (This part won't be needed when the driver
    moves to drivers/net/.) It also uses PHYLIB interfaces,
    so it should select PHYLIB. Fixes these build errors:

    ERROR: "phy_connect" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_find_first" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_register" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_alloc" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_stop" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_start" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_free" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_unregister" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_print_status" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_ethtool_gset" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_ethtool_sset" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_mii_ioctl" [drivers/staging/et131x/et131x.ko] undefined!

    Signed-off-by: Randy Dunlap
    Acked-by: : Mark Einon
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap
     
  • ET131X uses netdev interfaces so it should depend on NET.

    Fixes these build errors:
    ERROR: "ethtool_op_get_link" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "eth_validate_addr" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "register_netdev" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_connect" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_find_first" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_register" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_alloc" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "alloc_etherdev_mqs" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "netif_device_detach" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_stop" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "netif_device_attach" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_start" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "free_netdev" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_free" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "mdiobus_unregister" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "unregister_netdev" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "__netif_schedule" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_print_status" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "dev_kfree_skb_any" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "dev_alloc_skb" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "netif_rx" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "eth_type_trans" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "skb_put" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_ethtool_gset" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_ethtool_sset" [drivers/staging/et131x/et131x.ko] undefined!
    ERROR: "phy_mii_ioctl" [drivers/staging/et131x/et131x.ko] undefined!

    Signed-off-by: Randy Dunlap
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap
     
  • The slicoss driver uses network interfaces so it should depend
    on NET. Fixes the following build errors:

    ERROR: "eth_change_mtu" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "eth_validate_addr" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "register_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "alloc_etherdev_mqs" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "__netif_schedule" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "netif_rx" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "eth_type_trans" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "skb_put" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "skb_pull" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "__alloc_skb" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "free_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "unregister_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "consume_skb" [drivers/staging/slicoss/slicoss.ko] undefined!
    ERROR: "dev_kfree_skb_irq" [drivers/staging/slicoss/slicoss.ko] undefined!

    Signed-off-by: Randy Dunlap
    Cc: Lior Dotan
    Cc: Christopher Harrer
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap
     
  • Randy Dunlap reports that the ex131x driver doesn't build when CONFIG_PM_SLEEP is not enabled.
    This bug was introduced when moving code around to remove some forward declarations earlier, the #endif part of #ifdef CONFIG_PM_SLEEP was not moved at the same time. Now fixed by moving it to its proper place.

    Reported-by: Randy Dunlap
    Signed-off-by: Mark Einon
    Acked-by: Randy Dunlap
    Signed-off-by: Greg Kroah-Hartman

    Mark Einon
     

17 Nov, 2011

1 commit

  • Fix x86 allyesconfig builds. Builds fail due to a non-static variable
    named 'debug' in drivers/staging/media/as102:

    arch/x86/built-in.o:arch/x86/kernel/entry_32.S:1296: first defined here
    ld: Warning: size of symbol `debug' changed from 90 in arch/x86/built-in.o to 4 in drivers/built-in.o

    Thou shalt have no non-static identifiers that are named 'debug'.

    Signed-off-by: Randy Dunlap
    Cc: Pierrick Hascoet
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

10 Nov, 2011

1 commit


08 Nov, 2011

1 commit

  • * git://git.infradead.org/mtd-2.6: (226 commits)
    mtd: tests: annotate as DANGEROUS in Kconfig
    mtd: tests: don't use mtd0 as a default
    mtd: clean up usage of MTD_DOCPROBE_ADDRESS
    jffs2: add compr=lzo and compr=zlib options
    jffs2: implement mount option parsing and compression overriding
    mtd: nand: initialize ops.mode
    mtd: provide an alias for the redboot module name
    mtd: m25p80: don't probe device which has status of 'disabled'
    mtd: nand_h1900 never worked
    mtd: Add DiskOnChip G3 support
    mtd: m25p80: add EON flash EN25Q32B into spi flash id table
    mtd: mark block device queue as non-rotational
    mtd: r852: make r852_pm_ops static
    mtd: m25p80: add support for at25df321a spi data flash
    mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
    mtd: nand: switch `check_pattern()' to standard `memcmp()'
    mtd: nand: invalidate cache on unaligned reads
    mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
    mtd: nand: wait to set BBT version
    mtd: nand: scrub BBT on ECC errors
    ...

    Fix up trivial conflicts:
    - arch/arm/mach-at91/board-usb-a9260.c
    Merged into board-usb-a926x.c
    - drivers/mtd/maps/lantiq-flash.c
    add_mtd_partitions -> mtd_device_register vs changed to use
    mtd_device_parse_register.

    Linus Torvalds
     

07 Nov, 2011

1 commit

  • * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

05 Nov, 2011

1 commit

  • * 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits)
    block: don't call blk_drain_queue() if elevator is not up
    blk-throttle: use queue_is_locked() instead of lockdep_is_held()
    blk-throttle: Take blkcg->lock while traversing blkcg->policy_list
    blk-throttle: Free up policy node associated with deleted rule
    block: warn if tag is greater than real_max_depth.
    block: make gendisk hold a reference to its queue
    blk-flush: move the queue kick into
    blk-flush: fix invalid BUG_ON in blk_insert_flush
    block: Remove the control of complete cpu from bio.
    block: fix a typo in the blk-cgroup.h file
    block: initialize the bounce pool if high memory may be added later
    block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown
    block: drop @tsk from attempt_plug_merge() and explain sync rules
    block: make get_request[_wait]() fail if queue is dead
    block: reorganize throtl_get_tg() and blk_throtl_bio()
    block: reorganize queue draining
    block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()
    block: pass around REQ_* flags instead of broken down booleans during request alloc/free
    block: move blk_throtl prototypes to block/blk.h
    block: fix genhd refcounting in blkio_policy_parse_and_set()
    ...

    Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion
    and making the request functions be of type "void" instead of "int" in
    - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}
    - drivers/staging/zram/zram_drv.c

    Linus Torvalds
     

04 Nov, 2011

1 commit

  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
    [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
    [media] it913x [VER 1.07] Support for single ITE 9135 devices
    [media] Support for Terratec G1
    [media] cx25821: off by one in cx25821_vidioc_s_input()
    [media] media: tea5764: reconcile Kconfig symbol and macro
    [media] omap_vout: Add poll() support
    [media] omap3isp: preview: Add crop support on the sink pad
    [media] omap3isp: preview: Rename min/max input/output sizes defines
    [media] omap3isp: preview: Remove horizontal averager support
    [media] omap3isp: Report the ISP revision through the media controller API
    [media] omap3isp: ccdc: remove redundant operation
    [media] omap3isp: Fix memory leaks in initialization error paths
    [media] omap3isp: Add missing mutex_destroy() calls
    [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
    [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
    [media] MFC: Change MFC firmware binary name
    [media] vb2: add vb2_get_unmapped_area in vb2 core
    [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
    [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
    [media] media: ov6650: stylistic improvements
    ...

    Linus Torvalds
     

03 Nov, 2011

19 commits


02 Nov, 2011

1 commit


01 Nov, 2011

6 commits

  • Quoth Andrew:

    - Most of MM. Still waiting for the poweroc guys to get off their
    butts and review some threaded hugepages patches.

    - alpha

    - vfs bits

    - drivers/misc

    - a few core kerenl tweaks

    - printk() features

    - MAINTAINERS updates

    - backlight merge

    - leds merge

    - various lib/ updates

    - checkpatch updates

    * akpm: (127 commits)
    epoll: fix spurious lockdep warnings
    checkpatch: add a --strict check for utf-8 in commit logs
    kernel.h/checkpatch: mark strict_strto and simple_strto as obsolete
    llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
    wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
    fat: follow rename pack_hex_byte() to hex_byte_pack()
    security: follow rename pack_hex_byte() to hex_byte_pack()
    kgdb: follow rename pack_hex_byte() to hex_byte_pack()
    lib: rename pack_hex_byte() to hex_byte_pack()
    lib/string.c: fix strim() semantics for strings that have only blanks
    lib/idr.c: fix comment for ida_get_new_above()
    lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
    lib/bitmap.c: quiet sparse noise about address space
    lib/spinlock_debug.c: print owner on spinlock lockup
    lib/kstrtox: common code between kstrto*() and simple_strto*() functions
    drivers/leds/leds-lp5521.c: check if reset is successful
    leds: turn the blink_timer off before starting to blink
    leds: save the delay values after a successful call to blink_set()
    drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
    drivers/leds/leds-lm3530.c: add __devexit_p where needed
    ...

    Linus Torvalds
     
  • Standardize the style for compiler based printf format verification.
    Standardized the location of __printf too.

    Done via script and a little typing.

    $ grep -rPl --include=*.[ch] -w "__attribute__" * | \
    grep -vP "^(tools|scripts|include/linux/compiler-gcc.h)" | \
    xargs perl -n -i -e 'local $/; while (<>) { s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.+)\s*,\s*(.+)\s*\)\s*\)\s*\)/__printf($1, $2)/g ; print; }'

    [akpm@linux-foundation.org: revert arch bits]
    Signed-off-by: Joe Perches
    Cc: "Kirill A. Shutemov"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • This 2nd batch of implicit module.h users only appeared when we
    removed the unnecessary module.h from include/linux/miscdevice.h
    [The 1st batch is already present in Greg's staging tree.]

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • These files are using moduleparam infrastructure and were getting
    that via the implicit module.h presence that we are phasing out.
    So they'll need to include moduleparam.h explicitly in advance.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • Lots of drivers have in the past expected the presence of basic things
    like THIS_MODULE and EXPORT_SYMBOL. With the header cleanup, they wont
    have these. Call out the include explicitly.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
    [media] pctv452e: Remove bogus code
    [media] adv7175: Make use of media bus pixel codes
    [media] media: vb2: fix incorrect return value
    [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
    [media] cx23885: Stop the risc video fifo before reconfiguring it
    [media] cx23885: Avoid incorrect error handling and reporting
    [media] cx23885: Avoid stopping the risc engine during buffer timeout
    [media] cx23885: Removed a spurious function cx23885_set_scale()
    [media] cx23885: v4l2 api compliance, set the audioset field correctly
    [media] cx23885: hook the audio selection functions into the main driver
    [media] cx23885: add generic functions for dealing with audio input selection
    [media] cx23885: fixes related to maximum number of inputs and range checking
    [media] cx23885: Initial support for the MPX-885 mini-card
    [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
    [media] cx23885: Enable audio line in support from the back panel
    [media] cx23885: Allow the audio mux config to be specified on a per input basis
    [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
    [media] cx23885: Name an internal i2c part and declare a bitfield by name
    [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
    [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
    ...

    Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
    file rename vs add)

    Linus Torvalds