1. 28 Jun, 2011 27 commits
  2. 27 Jun, 2011 13 commits
    • Vitaliy Ivanov's avatar
      Fix some kernel-doc warnings · 4d258b25
      Vitaliy Ivanov authored
      Fix 'make htmldocs' warnings:
      
        Warning(/include/linux/hrtimer.h:153): No description found for parameter 'clockid'
        Warning(/include/linux/device.h:604): Excess struct/union/enum/typedef member 'of_match' description in 'device'
        Warning(/include/net/sock.h:349): Excess struct/union/enum/typedef member 'sk_rmem_alloc' description in 'sock'
      Signed-off-by: default avatarVitaliy Ivanov <vitalivanov@gmail.com>
      Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4d258b25
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · a64227b0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
        mmc: queue: bring discard_granularity/alignment into line with SCSI
        mmc: queue: append partition subname to queue thread name
        mmc: core: make erase timeout calculation allow for gated clock
        mmc: block: switch card to User Data Area when removing the block driver
        mmc: sdio: reset card during power_restore
        mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
        mmc: sdhi: DMA slave ID 0 is invalid
        mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling
        mmc: omap_hsmmc: use original sg_len for dma_unmap_sg
        mmc: omap_hsmmc: fix ocr mask usage
        mmc: sdio: fix runtime PM path during driver removal
        mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader
        mmc: sdhi: fix module unloading
        mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c
        mmc: vub300: fix null dereferences in error handling
      a64227b0
    • Greg Kroah-Hartman's avatar
      Staging: comedi: fix build breakages on some platforms · a73738e9
      Greg Kroah-Hartman authored
      Some platforms do not have virt_to_bus(), so properly depend on
      CONFIG_VIRT_TO_BUS for the Comedi drivers that need this function.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a73738e9
    • Greg Kroah-Hartman's avatar
      Staging: brcm80211: disable drivers except for X86 or MIPS platforms · d4620396
      Greg Kroah-Hartman authored
      As David points out, the driver is also broken on SPARC, so might
      as well just only enable it on platforms where people have reported it
      working, instead of trying to list all of the ones where it doesn't
      work, as the working platform list is much smaller...
      Reported-by: default avatarDavid Miller <davem@davemloft.net>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Henry Ptasinski <henryp@broadcom.com>
      Cc: Brett Rudley <brudley@broadcom.com>
      Cc: Roland Vossen <rvossen@broadcom.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      d4620396
    • Greg Kroah-Hartman's avatar
      Staging: brcm80211: disable drivers for PPC platforms · 15e5201d
      Greg Kroah-Hartman authored
      Right now, bad things happen if you try to build these drivers for the
      PPC platform as it seems that the code only has been tested and built on
      the MIPS big endian platform.
      
      So disable it on the PPC32 and PPC64 platforms for now, hopefully this
      will be resolved in the future as I'm sure someone will want to use
      these chips with that platform someday.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Henry Ptasinski <henryp@broadcom.com>
      Cc: Brett Rudley <brudley@broadcom.com>
      Cc: Roland Vossen <rvossen@broadcom.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      15e5201d
    • Geert Uytterhoeven's avatar
      Staging: iio: Make IIO depend on GENERIC_HARDIRQS · 928f9111
      Geert Uytterhoeven authored
      On m68k (which doesn't support generic hardirqs yet):
      
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trigger_poll’:
      drivers/staging/iio/industrialio-trigger.c:180: error: implicit declaration of function ‘generic_handle_irq’
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trigger_poll_chained’:
      drivers/staging/iio/industrialio-trigger.c:200: error: implicit declaration of function ‘handle_nested_irq’
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_release’:
      drivers/staging/iio/industrialio-trigger.c:379: error: implicit declaration of function ‘irq_modify_status’
      drivers/staging/iio/industrialio-trigger.c:382: error: implicit declaration of function ‘irq_set_chip’
      drivers/staging/iio/industrialio-trigger.c:384: error: implicit declaration of function ‘irq_set_handler’
      drivers/staging/iio/industrialio-trigger.c:388: error: implicit declaration of function ‘irq_free_descs’
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_subirqmask’:
      drivers/staging/iio/industrialio-trigger.c:402: error: implicit declaration of function ‘irq_data_get_irq_chip’
      drivers/staging/iio/industrialio-trigger.c:402: warning: initialization makes pointer from integer without a cast
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_subirqunmask’:
      drivers/staging/iio/industrialio-trigger.c:411: warning: initialization makes pointer from integer without a cast
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_allocate_trigger’:
      drivers/staging/iio/industrialio-trigger.c:432: error: implicit declaration of function ‘irq_alloc_descs’
      drivers/staging/iio/industrialio-trigger.c:455: error: ‘handle_simple_irq’ undeclared (first use in this function)
      drivers/staging/iio/industrialio-trigger.c:455: error: (Each undeclared identifier is reported only once
      drivers/staging/iio/industrialio-trigger.c:455: error: for each function it appears in.)
      
      Hence IIO_TRIGGER should depend on GENERIC_HARDIRQS.
      But as IIO_TRIGGER and IIO_RING_BUFFER form a maze of dependencies and selects,
      just make the whole IIO subsystem depend on GENERIC_HARDIRQS.
      
      This dependency also covers !S390, so that one can be removed again.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      928f9111
    • Tomas Winkler's avatar
      Staging: mei: fix suspend failure · a534bb6e
      Tomas Winkler authored
      wait_event_interruptible_timeout return value was wrongly used.
      The remaining timeout was used as the error code.
      This fix translated wait_event_interruptible_timeout return value
      into error code that can be propagated.
      
      [10291.674121] pci_pm_suspend(): mei_pci_suspend+0x0/0x8b [mei] returns 2500
      It's thinkpad t400 with
      00:03.0 Communication controller [0780]: Intel Corporation Mobile 4 Series Chipset MEI Controller [8086:2a44] (rev 07)
      Reported-by: default avatarArkadiusz Miskiewicz <a.miskiewicz@gmail.com>
      Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a534bb6e
    • Randy Dunlap's avatar
      Staging: fix iio builds when IIO_RING_BUFFER is not enabled · fdf2df0e
      Randy Dunlap authored
      Fix build by moving enum list outside of
      #ifdef CONFIG_IIO_RING_BUFFER.
      
      drivers/staging/iio/accel/adis16201_core.c:413: error: 'ADIS16201_SCAN_SUPPLY' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16201_core.c:417: error: 'ADIS16201_SCAN_TEMP' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16201_core.c:422: error: 'ADIS16201_SCAN_ACC_X' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16201_core.c:427: error: 'ADIS16201_SCAN_ACC_Y' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16201_core.c:432: error: 'ADIS16201_SCAN_AUX_ADC' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16201_core.c:436: error: 'ADIS16201_SCAN_INCLI_X' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16201_core.c:441: error: 'ADIS16201_SCAN_INCLI_Y' undeclared here (not in a function)
      
      vers/staging/iio/accel/adis16203_core.c:374: error: 'ADIS16203_SCAN_SUPPLY' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16203_core.c:378: error: 'ADIS16203_SCAN_AUX_ADC' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16203_core.c:382: error: 'ADIS16203_SCAN_INCLI_X' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16203_core.c:388: error: 'ADIS16203_SCAN_INCLI_Y' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16203_core.c:392: error: 'ADIS16203_SCAN_TEMP' undeclared here (not in a function)
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      fdf2df0e
    • Ralf Baechle's avatar
      Staging: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE · 6fab3e1f
      Ralf Baechle authored
      On architectures that don't define PAGE_KERNEL_NOCACHE, the Comedi driver turns
      into tragedy:
      
        CC [M]  drivers/staging/comedi/drivers.o
      drivers/staging/comedi/drivers.c: In function ‘comedi_buf_alloc’:
      drivers/staging/comedi/drivers.c:505:41: error: ‘PAGE_KERNEL_NOCACHE’ undeclared (first use in this function)
      drivers/staging/comedi/drivers.c:505:41: note: each undeclared identifier is rep orted only once for each function it appears in
      make[3]: *** [drivers/staging/comedi/drivers.o] Error 1
      
      Restrict the driver to only those architectures that define PAGE_KERNEL_NOCACHE.
      
      PAGE_KERNEL_NOCACHE is a kludge - some system architectures such as SGI IP27
      are even uable to offer uncached operation - at least in the way an unwitting
      driver might assume.  I haven't looked in details how the driver is using
      the area vmaped with PAGE_KERNEL_NOCACHE but maybe doing it XFS-style using
      cached memory and the flush_kernel_vmap_range / invalidate_kernel_vmap_range
      APIs in conjunction with the DMA API is a practical alternative.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Reported-by: default avatarDavid Miller <davem@davemloft.net>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Cc: Martyn Welch <martyn.welch@ge.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      6fab3e1f
    • Randy Dunlap's avatar
      Staging: fix more iio builds when IIO_RING_BUFFER is not enabled · 89089158
      Randy Dunlap authored
      Fix lots more build errors in staging/iio when CONFIG_IIO_RING_BUFFER
      is not enabled by moving enums and defines outside of the
      CONFIG_IIO_RING_BUFFER ifdef block.
      
      Examples (one from each driver; there were 116 total errors):
      
      drivers/staging/iio/accel/adis16204_core.c:437: error: 'ADIS16204_SCAN_SUPPLY' undeclared here (not in a function)
      drivers/staging/iio/accel/adis16209_core.c:410: error: 'ADIS16209_SCAN_SUPPLY' undeclared here (not in a function)
      drivers/staging/iio/gyro/adis16260_core.c:420: error: 'ADIS16260_SCAN_GYRO' undeclared here (not in a function)
      drivers/staging/iio/imu/adis16400_core.c:565: error: 'ADIS16400_SCAN_SUPPLY' undeclared here (not in a function)
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      89089158
    • KAMEZAWA Hiroyuki's avatar
      Fix node_start/end_pfn() definition for mm/page_cgroup.c · c6830c22
      KAMEZAWA Hiroyuki authored
      commit 21a3c964 uses node_start/end_pfn(nid) for detection start/end
      of nodes. But, it's not defined in linux/mmzone.h but defined in
      /arch/???/include/mmzone.h which is included only under
      CONFIG_NEED_MULTIPLE_NODES=y.
      
      Then, we see
        mm/page_cgroup.c: In function 'page_cgroup_init':
        mm/page_cgroup.c:308: error: implicit declaration of function 'node_start_pfn'
        mm/page_cgroup.c:309: error: implicit declaration of function 'node_end_pfn'
      
      So, fixiing page_cgroup.c is an idea...
      
      But node_start_pfn()/node_end_pfn() is a very generic macro and
      should be implemented in the same manner for all archs.
      (m32r has different implementation...)
      
      This patch removes definitions of node_start/end_pfn() in each archs
      and defines a unified one in linux/mmzone.h. It's not under
      CONFIG_NEED_MULTIPLE_NODES, now.
      
      A result of macro expansion is here (mm/page_cgroup.c)
      
      for !NUMA
       start_pfn = ((&contig_page_data)->node_start_pfn);
        end_pfn = ({ pg_data_t *__pgdat = (&contig_page_data); __pgdat->node_start_pfn + __pgdat->node_spanned_pages;});
      
      for NUMA (x86-64)
        start_pfn = ((node_data[nid])->node_start_pfn);
        end_pfn = ({ pg_data_t *__pgdat = (node_data[nid]); __pgdat->node_start_pfn + __pgdat->node_spanned_pages;});
      
      Changelog:
       - fixed to avoid using "nid" twice in node_end_pfn() macro.
      Reported-and-acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Reported-and-tested-by: default avatarIngo Molnar <mingo@elte.hu>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c6830c22
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · af4087e0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        btrfs: fix inconsonant inode information
        Btrfs: make sure to update total_bitmaps when freeing cache V3
        Btrfs: fix type mismatch in find_free_extent()
        Btrfs: make sure to record the transid in new inodes
      af4087e0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 4699d442
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: prevent bogus assert when trying to remove non-existent attribute
        xfs: clear XFS_IDIRTY_RELEASE on truncate down
        xfs: reset inode per-lifetime state when recycling it
      4699d442