1. 10 Dec, 2009 40 commits
    • Linus Torvalds's avatar
      Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · ab1831b0
      Linus Torvalds authored
      * 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen: try harder to balloon up under memory pressure.
        Xen balloon: fix totalram_pages counting.
        xen: explicitly create/destroy stop_machine workqueues outside suspend/resume region.
        xen: improve error handling in do_suspend.
        xen: don't leak IRQs over suspend/resume.
        xen: call clock resume notifier on all CPUs
        xen: use iret for return from 64b kernel to 32b usermode
        xen: don't call dpm_resume_noirq() with interrupts disabled.
        xen: register runstate info for boot CPU early
        xen: register runstate on secondary CPUs
        xen: register timer interrupt with IRQF_TIMER
        xen: correctly restore pfn_to_mfn_list_list after resume
        xen: restore runstate_info even if !have_vcpu_info_placement
        xen: re-register runstate area earlier on resume.
        xen: wait up to 5 minutes for device connetion
        xen: improvement to wait_for_devices()
        xen: fix is_disconnected_device/exists_disconnected_device
        xen/xenbus: make DEVICE_ATTR()s static
    • Linus Torvalds's avatar
      Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · eae6fa9b
      Linus Torvalds authored
      * 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
        fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
        fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag.
        Fix toogle whether xenbus driver should be built as module or part of kernel.
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 4515c306
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (47 commits)
        ext4: Fix potential fiemap deadlock (mmap_sem vs. i_data_sem)
        ext4: Do not override ext2 or ext3 if built they are built as modules
        jbd2: Export jbd2_log_start_commit to fix ext4 build
        ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT
        ext4: Wait for proper transaction commit on fsync
        ext4: fix incorrect block reservation on quota transfer.
        ext4: quota macros cleanup
        ext4: ext4_get_reserved_space() must return bytes instead of blocks
        ext4: remove blocks from inode prealloc list on failure
        ext4: wait for log to commit when umounting
        ext4: Avoid data / filesystem corruption when write fails to copy data
        ext4: Use ext4 file system driver for ext2/ext3 file system mounts
        ext4: Return the PTR_ERR of the correct pointer in setup_new_group_blocks()
        jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer()
        ext4: remove unused parameter wbc from __ext4_journalled_writepage()
        ext4: remove encountered_congestion trace
        ext4: move_extent_per_page() cleanup
        ext4: initialize moved_len before calling ext4_move_extents()
        ext4: Fix double-free of blocks with EXT4_IOC_MOVE_EXT
        ext4: use ext4_data_block_valid() in ext4_free_blocks()
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · a5eba3f6
      Linus Torvalds authored
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: Multi-device mirror support
        exofs: Move all operations to an io_engine
        exofs: move osd.c to ios.c
        exofs: statfs blocks is sectors not FS blocks
        exofs: Prints on mount and unmout
        exofs: refactor exofs_i_info initialization into common helper
        exofs: dbg-print less
        exofs: More sane debug print
        trivial: some small fixes in exofs documentation
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/ubifs-2.6 · fc1495bf
      Linus Torvalds authored
      * git://git.infradead.org/ubifs-2.6:
        UBIFS: fix return code in check_leaf
        UBI: flush wl before clearing update marker
        MAINTAINERS: change e-mail of Artem Bityutskiy
        UBIFS: remove manual O_SYNC handling
        UBIFS: support mounting of UBI volume character devices
        UBI: Add ubi_open_volume_path
    • David Wong's avatar
      V4L/DVB (13592): max2165: 32bit build patch · 5476ffd2
      David Wong authored
      This patch drops usage of floating point variable for 32bit build
      Signed-off-by: default avatarDavid T. L. Wong <davidtlwong@gmail.com>
      Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
    • Boaz Harrosh's avatar
      exofs: Multi-device mirror support · 04dc1e88
      Boaz Harrosh authored
      This patch changes on-disk format, it is accompanied with a parallel
      patch to mkfs.exofs that enables multi-device capabilities.
      After this patch, old exofs will refuse to mount a new formatted FS and
      new exofs will refuse an old format. This is done by moving the magic
      field offset inside the FSCB. A new FSCB *version* field was added. In
      the future, exofs will refuse to mount unmatched FSCB version. To
      up-grade or down-grade an exofs one must use mkfs.exofs --upgrade option
      before mounting.
      Introduced, a new object that contains a *device-table*. This object
      contains the default *data-map* and a linear array of devices
      information, which identifies the devices used in the filesystem. This
      object is only written to offline by mkfs.exofs. This is why it is kept
      separate from the FSCB, since the later is written to while mounted.
      Same partition number, same object number is used on all devices only
      the device varies.
      * define the new format, then load the device table on mount time make
        sure every thing is supported.
      * Change I/O engine to now support Mirror IO, .i.e write same data
        to multiple devices, read from a random device to spread the
        read-load from multiple clients (TODO: stripe read)
      Implementation notes:
       A few points introduced in previous patch should be mentioned here:
      * Special care was made so absolutlly all operation that have any chance
        of failing are done before any osd-request is executed. This is to
        minimize the need for a data consistency recovery, to only real IO
      * Each IO state has a kref. It starts at 1, any osd-request executed
        will increment the kref, finally when all are executed the first ref
        is dropped. At IO-done, each request completion decrements the kref,
        the last one to return executes the internal _last_io() routine.
        _last_io() will call the registered io_state_done. On sync mode a
        caller does not supply a done method, indicating a synchronous
        request, the caller is put to sleep and a special io_state_done is
        registered that will awaken the caller. Though also in sync mode all
        operations are executed in parallel.
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Boaz Harrosh's avatar
      exofs: Move all operations to an io_engine · 06886a5a
      Boaz Harrosh authored
      In anticipation for multi-device operations, we separate osd operations
      into an abstract I/O API. Currently only one device is used but later
      when adding more devices, we will drive all devices in parallel according
      to a "data_map" that describes how data is arranged on multiple devices.
      The file system level operates, like before, as if there is one object
      (inode-number) and an i_size. The io engine will split this to the same
      object-number but on multiple device.
      At first we introduce Mirror (raid 1) layout. But at the final outcome
      we intend to fully implement the pNFS-Objects data-map, including
      raid 0,4,5,6 over mirrored devices, over multiple device-groups. And
      more. See: http://tools.ietf.org/html/draft-ietf-nfsv4-pnfs-obj-12
      * Define an io_state based API for accessing osd storage devices
        in an abstract way.
      	First a caller allocates an io state with:
      		exofs_get_io_state(struct exofs_sb_info *sbi,
      				   struct exofs_io_state** ios);
      	Then calles one of:
      		exofs_sbi_create(struct exofs_io_state *ios);
      		exofs_sbi_remove(struct exofs_io_state *ios);
      		exofs_sbi_write(struct exofs_io_state *ios);
      		exofs_sbi_read(struct exofs_io_state *ios);
      		exofs_oi_truncate(struct exofs_i_info *oi, u64 new_len);
      	And when done
      		exofs_put_io_state(struct exofs_io_state *ios);
      * Convert all source files to use this new API
      * Convert from bio_alloc to bio_kmalloc
      * In io engine we make use of the now fixed osd_req_decode_sense
      There are no functional changes or on disk additions after this patch.
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Boaz Harrosh's avatar
      exofs: move osd.c to ios.c · 8ce9bdd1
      Boaz Harrosh authored
      If I do a "git mv" together with a massive code change
      and commit in one patch, git looses the rename and
      records a delete/new instead. This is bad because I want
      a rename recorded so later rebased/cherry-picked patches
      to the old name will work. Also the --follow is lost.
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Boaz Harrosh's avatar
      exofs: statfs blocks is sectors not FS blocks · cae012d8
      Boaz Harrosh authored
      Even though exofs has a 4k block size, statfs blocks
      is in sectors (512 bytes).
      Also if target returns 0 for capacity then make it
      ULLONG_MAX. df does not like zero-size filesystems
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Boaz Harrosh's avatar
      exofs: Prints on mount and unmout · 19fe294f
      Boaz Harrosh authored
      It is important to print in the logs when a filesystem was
      mounted and eventually unmounted.
      Print the osd-device's osd_name and pid the FS was
      mounted/unmounted on.
      TODO: How to also print the namespace path the filesystem was
            mounted on?
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Boaz Harrosh's avatar
      exofs: refactor exofs_i_info initialization into common helper · 9cfdc7aa
      Boaz Harrosh authored
      There are two places that initialize inodes: exofs_iget() and
      As more members of exofs_i_info that need initialization are
      added this code will grow. (soon)
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Boaz Harrosh's avatar
      exofs: dbg-print less · fe33cc1e
      Boaz Harrosh authored
      Iner-loops printing is converted to EXOFS_DBG2 which is #defined
      to nothing.
      It is now almost bareable to just leave debug-on. Every operation
      is printed once, with most relevant info (I hope).
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Boaz Harrosh's avatar
      exofs: More sane debug print · 58311c43
      Boaz Harrosh authored
      debug prints should be somewhat useful without actually
      reading the source code
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Thadeu Lima de Souza Cascardo's avatar
      trivial: some small fixes in exofs documentation · 9f249162
      Thadeu Lima de Souza Cascardo authored
      Add exofs.txt to filesystems Documentation index and fix some typos,
      identation and grammar.
      Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
    • Linus Torvalds's avatar
      Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 3067e02f
      Linus Torvalds authored
      * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
        ACPICA: Update version to 20091112.
        ACPICA: Add additional module-level code support
        ACPICA: Deploy new create integer interface where appropriate
        ACPICA: New internal utility function to create Integer objects
        ACPICA: Add repair for predefined methods that must return sorted lists
        ACPICA: Fix possible fault if return Package objects contain NULL elements
        ACPICA: Add post-order callback to acpi_walk_namespace
        ACPICA: Change package length error message to an info message
        ACPICA: Reduce severity of predefined repair messages, Warning to Info
        ACPICA: Update version to 20091013
        ACPICA: Fix possible memory leak for Scope ASL operator
        ACPICA: Remove possibility of executing _REG methods twice
        ACPICA: Add repair for bad _MAT buffers
        ACPICA: Add repair for bad _BIF/_BIX packages
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · f71eaf68
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (41 commits)
        hwmon: (adt7475) Add VID support for the ADT7476
        hwmon: (adt7475) Add an entry in MAINTAINERS
        hwmon: (adt7475) Add support for the ADT7476
        hwmon: (adt7475) Voltage attenuators can be bypassed
        hwmon: (adt7475) Print device information on probe
        hwmon: (adt7475) Handle alternative pin functions
        hwmon: (adt7475) Move sysfs files removal to a separate function
        hwmon: (adt7475) Add support for the ADT7490
        hwmon: (adt7475) Improve device detection
        hwmon: (adt7475) Add missing static marker
        hwmon: (adt7475) Rework voltage inputs handling
        hwmon: (adt7475) Implement pwm_use_point2_pwm_at_crit
        hwmon: (adt7475) New documentation
        hwmon: (adt7475) Add support for the ADT7473
        hwmon: (f71882fg) Add support for the f71889fg (version 2)
        hwmon: (f71882fg) Fix sysfs file removal
        hwmon: (f71882fg) Cleanup sysfs attr creation 2/2
        hwmon: (f71882fg) Cleanup sysfs attr creation 1/2
        hwmon: (thmc50) Stop using I2C_CLIENT_MODULE_PARM
        hwmon: Add Freescale MC13783 ADC driver
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 78f1ae19
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume
        ALSA: hda/realtek: quirk for D945GCLF2 mainboard
        ALSA: hda - Terradici HDA controllers does not support 64-bit mode
        ALSA: document: Add direct git link to grub hda-analyzer
        ALSA: radio/sound/miro: fix build, cleanup depends/selects
        ALSA: hda - Generalize EAPD inversion check in patch_analog.c
        ASoC: Wrong variable returned on error
        ALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII
        ALSA: hda - Exclude unusable ADCs for ALC88x
        ALSA: hda - Add missing Line-Out and PCM switches as slave
        ALSA: hda - iMac 9,1 sound patch.
        ALSA: opti93x: set MC indirect registers base from PnP data
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · fa395aae
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (51 commits)
        Input: appletouch - give up maintainership
        Input: dm355evm_kbd - switch to using sparse keymap library
        Input: wistron_btns - switch to using sparse keymap library
        Input: add generic support for sparse keymaps
        Input: fix memory leak in force feedback core
        Input: wistron - remove identification strings from DMI table
        Input: psmouse - remove identification strings from DMI tables
        Input: atkbd - remove identification strings from DMI table
        Input: i8042 - remove identification strings from DMI tables
        DMI: allow omitting ident strings in DMI tables
        Input: psmouse - do not carry DMI data around
        Input: matrix-keypad - switch to using dev_pm_ops
        Input: keyboard - fix lack of locking when traversing handler->h_list
        Input: gpio_keys - scan gpio state at probe and resume time
        Input: keyboard - add locking around event handling
        Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controller
        Input: xpad - add two new Xbox 360 devices
        Input: polled device - do not start polling if interval is zero
        Input: polled device - schedule first poll immediately
        Input: add S3C24XX touchscreen driver
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 3e746831
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
        V4L/DVB (13542): ir-keytable: Allow dynamic table change
        V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
        V4L/DVB (13540): ir-common: Cleanup get key evdev code
        V4L/DVB (13539): ir-common: add __func__ for debug messages
        V4L/DVB (13538): ir-common: Use a dynamic keycode table
        V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
        V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
        V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
        V4L/DVB (13534): ir-common: Remove some unused fields/structs
        V4L/DVB (13533): ir: use dynamic tables, instead of static ones
        V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
        V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
        V4L/DVB (13458): go7007: subdev conversion
        V4L/DVB (13457): s2250: subdev conversion
        V4L/DVB (13456): s2250: Change module structure
        V4L/DVB (13528): em28xx: add support for em2800 VC211A card
        em28xx: don't reduce scale to half size for em2800
        em28xx: don't load audio modules when AC97 is mis-detected
        em28xx: em2800 chips support max width of 640
        V4L/DVB (13523): dvb-bt8xx: fix compile warning
      Fix up trivial conflicts due to spelling fixes from the trivial tree in
    • Linus Torvalds's avatar
      Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux · 6825fbc4
      Linus Torvalds authored
      * 'next-i2c' of git://git.fluff.org/bjdooks/linux: (25 commits)
        i2c-pnx: Map I2C adapter number to platform ID number
        i2c-omap: OMAP3: PM: (re)init for every transfer to support off-mode
        i2c-designware: i2c_dw_handle_tx_abort: Use dev_dbg() for NOACK cases
        i2c-designware: Cosmetic cleanups
        i2c-designware: Tx abort cleanups
        i2c-designware: Skip RX_FULL and TX_EMPTY bits on tx abort errors
        i2c-designware: i2c_dw_xfer_msg: Fix error handling procedures
        i2c-designware: Disable TX_EMPTY when all i2c_msg msgs has been processed
        i2c-designware: Process all i2c_msg messages in the interrupt handler
        i2c-designware: i2c_dw_read: Remove redundant target address checker
        i2c-designware: i2c_dw_func: Set I2C_FUNC_SMBUS_foo bits
        i2c-designware: Initialize byte count variables just prior to being used
        i2c-designware: i2c_dw_xfer_msg: Introduce a local "buf" pointer
        i2c-designware: Divide i2c_dw_xfer_msg into two functions
        i2c-designware: Enable RX_FULL interrupt
        i2c-designware: Set Tx/Rx FIFO threshold levels
        i2c-designware: Process i2c_msg messages in the interrupt handler
        i2c-designware: i2c_dw_xfer_msg: Fix i2c_msg search bug
        i2c-designware: Improved _HCNT/_LCNT calculation
        i2c-designware: Remove an useless local variable "num"
    • Linus Torvalds's avatar
      Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux · 6bb951a0
      Linus Torvalds authored
      * 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux:
        ARM: S3C24XX: DMA: Use valid index when accessing array
        ARM: S3C: move s3c_pwm_remove to .devexit.text
        ARM: S3C24XX: Export s3c24xx_set_fiq for modules.
        ARM: S3C: move s3c_adc_remove to .devexit.text
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 · e49aedb5
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
        sl82c105: remove no longer needed debugging code
        sis5513: remove stale TODO
        pdc202xx_old: remove no longer needed debugging code
        cy82c693: remove no longer needed debugging code
        cmd64x: remove no longer needed debugging code
        alim15x3: remove obsolete and dangerous wdc_udma parameter
        ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives.
        cs5535: add pci id for AMD based CS5535 controllers
        slc90e66: fix UDMA handling
        drivers/ide/tx4938ide.c: use resource_size()
        drivers/ide/ide_platform.c: use resource_size()
        drivers/ide/au1xxx-ide.c: use resource_size()
        hpt366: remove dead old timing tables
        ide: update Kconfig text to mark as deprecated
        ide-tape: remove the BKL
        hpt366: kill unused #define's
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 4ef58d4e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
        tree-wide: fix misspelling of "definition" in comments
        reiserfs: fix misspelling of "journaled"
        doc: Fix a typo in slub.txt.
        inotify: remove superfluous return code check
        hdlc: spelling fix in find_pvc() comment
        doc: fix regulator docs cut-and-pasteism
        mtd: Fix comment in Kconfig
        doc: Fix IRQ chip docs
        tree-wide: fix assorted typos all over the place
        drivers/ata/libata-sff.c: comment spelling fixes
        fix typos/grammos in Documentation/edac.txt
        sysctl: add missing comments
        fs/debugfs/inode.c: fix comment typos
        sgivwfb: Make use of ARRAY_SIZE.
        sky2: fix sky2_link_down copy/paste comment error
        tree-wide: fix typos "couter" -> "counter"
        tree-wide: fix typos "offest" -> "offset"
        fix kerneldoc for set_irq_msi()
        spidev: fix double "of of" in comment
        comment typo fix: sybsystem -> subsystem
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f6c4c819
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: add multi-input quirk for NextWindow Touchscreen.
        HID: add support for Acan FG-8100 barcode reader
        HID: make Media key on Logitech DiNovo Mini work
        HID: support Logitech/3DConnexion SpaceTraveler and SpaceNavigator
        HID: remove BKL from hiddev_ioctl_usage()
        HID: fixup quirk for NCR devices
        HID: pidff - fix unnecessary loop iterations on reset
        HID: add NOGET quirk for another device from CH Products
        HID: remove useless DRIVER_VERSION macro
        HID: fix MODULE_AUTHOR usage in HID modules
        HID: blacklist Acer Ferrari 4005 optical mouse
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 382f51fe
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (222 commits)
        [SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class
        [SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED
        [SCSI] zfcp: Update FSF error reporting
        [SCSI] zfcp: Improve ELS ADISC handling
        [SCSI] zfcp: Simplify handling of ct and els requests
        [SCSI] zfcp: Remove ZFCP_DID_MASK
        [SCSI] zfcp: Move WKA port to zfcp FC code
        [SCSI] zfcp: Use common code definitions for FC CT structs
        [SCSI] zfcp: Use common code definitions for FC ELS structs
        [SCSI] zfcp: Update FCP protocol related code
        [SCSI] zfcp: Dont fail SCSI commands when transitioning to blocked fc_rport
        [SCSI] zfcp: Assign scheduled work to driver queue
        [SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required anymore
        [SCSI] zfcp: Implement module unloading
        [SCSI] zfcp: Merge trace code for fsf requests in one function
        [SCSI] zfcp: Access ports and units with container_of in sysfs code
        [SCSI] zfcp: Remove suspend callback
        [SCSI] zfcp: Remove global config_mutex
        [SCSI] zfcp: Replace local reference counting with common kref
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 701791cc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: export clk_* symbols in clk.c
        m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.
        m68knommu: Move __init_end out of the .init section.
        m68knommu: Move __init_begin out of the .init section.
        m68knommu: Use more macros inside the .init section.
        m68knommu: Make THREAD_SIZE available to assembly files.
        m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.
        m68knommu: rename BSS define in linker script
        m68knommu: add a task_pt_regs() macro
        m68knommu: define arch_has_single_step() and friends
        m68knommu: add uboot commandline argument passing support
        m68knommu: Coldfire GPIO corrections
        m68knommu: move mcf_remove to .devexit.text
      Fixed up (?) conflict in arch/m68k/include/asm/ptrace.h
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 3a43aaa3
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (137 commits)
        sh: include empty zero page in romImage
        sh: Make associative cache writes fatal on all SH-4A parts.
        sh: Drop associative writes for SH-4 cache flushes.
        sh: Partial revert of copy/clear_user_highpage() optimizations.
        sh: Add default uImage rule for se7724, ap325rxa, and migor.
        sh: allow runtime pm without suspend/resume callbacks
        sh: mach-ecovec24: Remove un-defined settings for VPU
        sh: mach-ecovec24: LCDC drive ability become high
        sh: fix sh7724 VEU3F resource size
        serial: sh-sci: Fix too early port disabling.
        sh: pfc: pr_info() -> pr_debug() cleanups.
        sh: pfc: Convert from ctrl_xxx() to __raw_xxx() I/O routines.
        sh: Improve kfr2r09 serial port setup code
        sh: Break out SuperH PFC code
        sh: Move KEYSC header file
        sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file
        sh: Add CPG save/restore code for sh7724 R-standby
        sh: Add SDHI power control support to Ecovec
        mfd: Add power control platform data to SDHI driver
        sh: mach-ecovec24: modify address map
    • Linus Torvalds's avatar
      Merge branch 'davinci-for-linus' of... · aed886ce
      Linus Torvalds authored
      Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
      * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (69 commits)
        davinci: Initial support for Neuros OSD2 platform.
        davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c
        davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c
        DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM
        DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities
        davinci: DA8XX/OMAP-L1XX: enable cpuidle and regulator in defconfig
        davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator
        davinci: DA850/OMAP-L138 EVM: register for cpuidle support
        davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register
        davinci: add CPU idle driver
        davinci: DA8XX/OMAP-L1XX: fix compiler warning
        davinci: DA850/OMAP-L138: eliminate static function declaration
        davinci: DA850/OMAP-L138 EVM: simplify configuration of emac in MII/RMII mode
        davinci: DA850/OMAP-L138 EVM: get rid of DA850_UI_EXP config option
        davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY
        davinci: DA830/OMAP-L137 EVM: do not configure NAND on UI card when MMC/SD is selected
        davinci: DA830/OMAP-L137 EVM: use runtime detection for UI card
        davinci: DA830/OMAP-L137 EVM: remove ifdefs inside da830_evm_init()
        davinci: DA830/OMAP-L137 EVM: fix warning with default config
        davinci: Add NAND support for DA830/OMAP-L137 EVM platform
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 67dd2f5a
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (72 commits)
        [S390] 3215/3270 console: remove wrong comment
        [S390] dasd: remove BKL from extended error reporting code
        [S390] vmlogrdr: remove BKL
        [S390] vmur: remove BKL
        [S390] zcrypt: remove BKL
        [S390] 3270: remove BKL
        [S390] vmwatchdog: remove lock_kernel() from open() function
        [S390] monwriter: remove lock_kernel() from open() function
        [S390] monreader: remove lock_kernel() from open() function
        [S390] s390: remove unused nfsd #includes
        [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
        [S390] etr/stp: put correct per cpu variable
        [S390] tty3270: move keyboard compat ioctls
        [S390] sclp: improve servicability setting
        [S390] s390: use change recording override for kernel mapping
        [S390] MAINTAINERS: Add s390 drivers block
        [S390] use generic sockios.h header file
        [S390] use generic termbits.h header file
        [S390] smp: remove unused typedef and defines
        [S390] cmm: free pages on hibernate.
    • Jean Delvare's avatar
      Doc: use misc-devices/ dir for drivers · 5327b9b8
      Jean Delvare authored
      We have a directory for misc drivers documentation, let's use it.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: "Darrick J. Wong" <djwong@us.ibm.com>
      Cc: Rodolfo Giometti <giometti@linux.it>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Luis Garces-Erice's avatar
      Doc: better explanation of procs_running · e3cc2226
      Luis Garces-Erice authored
      the description in Documentation/filesystems/proc.txt of the
      procs_running entry in /proc/stat is confusing (according to that
      description, it looks as if procs_running could only be a number
      between 0 and the number of CPUs).
      Changed it to a more accurate description in the patch attached.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Dominik D. Geyer's avatar
      correct gpio.txt typos · bfc9dcab
      Dominik D. Geyer authored
      Corrected sysfs gpio chip node name and fixed punctuation.
      Signed-off-by: default avatarDominik D. Geyer <dominik.geyer@gmx.de>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: David Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Shawn Bohrer's avatar
      docbook: fix signal_pending() argument · 2770f189
      Shawn Bohrer authored
      Since signal_pending() takes a task_struct pointer as an argument, update
      the example to pass in 'current'.
      Signed-off-by: default avatarShawn Bohrer <shawn.bohrer@gmail.com>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Marin Mitov's avatar
      use DMA_BIT_MASK instead of inline constant · 038f7d00
      Marin Mitov authored
      Use DMA_BIT_MASK(24) instead of 0x00ffffff in DMA-mapping.txt
      Signed-off-by: default avatarMarin Mitov <mitov@issp.bas.bg>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Randy Dunlap's avatar
    • Frederic Weisbecker's avatar
      nvram: Fix missing smp_lock.h in nvram · 79a56ed0
      Frederic Weisbecker authored
      The bkl has been removed from nvram_llseek() and smp_lock.h was removed
      because another patch in the same tree zapped the remaining usage of bkl
      in the same file.  But this patch must have been excluded later, then we
      still need the smp_lock.h headers for the bkl use in nvram_open().
      This fixes the following build error:
        drivers/char/nvram.c: In function ‘nvram_open’:
        drivers/char/nvram.c:332: erreur: implicit declaration of function ‘lock_kernel’
        drivers/char/nvram.c:339: erreur: implicit declaration of function ‘unlock_kernel’
        make[2]: *** [drivers/char/nvram.o] Erreur 1
        make[1]: *** [drivers/char] Erreur 2
        make: *** [drivers] Erreur 2
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Theodore Ts'o's avatar
      ext4: Fix potential fiemap deadlock (mmap_sem vs. i_data_sem) · fab3a549
      Theodore Ts'o authored
      Fix the following potential circular locking dependency between
      mm->mmap_sem and ei->i_data_sem:
          [ INFO: possible circular locking dependency detected ]
          2.6.32-04115-gec044c5 #37
          ureadahead/1855 is trying to acquire lock:
           (&mm->mmap_sem){++++++}, at: [<ffffffff81107224>] might_fault+0x5c/0xac
          but task is already holding lock:
           (&ei->i_data_sem){++++..}, at: [<ffffffff811be1fd>] ext4_fiemap+0x11b/0x159
          which lock already depends on the new lock.
          the existing dependency chain (in reverse order) is:
          -> #1 (&ei->i_data_sem){++++..}:
                 [<ffffffff81099bfa>] __lock_acquire+0xb67/0xd0f
                 [<ffffffff81099e7e>] lock_acquire+0xdc/0x102
                 [<ffffffff81516633>] down_read+0x51/0x84
                 [<ffffffff811a2414>] ext4_get_blocks+0x50/0x2a5
                 [<ffffffff811a3453>] ext4_get_block+0xab/0xef
                 [<ffffffff81154f39>] do_mpage_readpage+0x198/0x48d
                 [<ffffffff81155360>] mpage_readpages+0xd0/0x114
                 [<ffffffff811a104b>] ext4_readpages+0x1d/0x1f
                 [<ffffffff810f8644>] __do_page_cache_readahead+0x12f/0x1bc
                 [<ffffffff810f86f2>] ra_submit+0x21/0x25
                 [<ffffffff810f0cfd>] filemap_fault+0x19f/0x32c
                 [<ffffffff81107b97>] __do_fault+0x55/0x3a2
                 [<ffffffff81109db0>] handle_mm_fault+0x327/0x734
                 [<ffffffff8151aaa9>] do_page_fault+0x292/0x2aa
                 [<ffffffff81518205>] page_fault+0x25/0x30
                 [<ffffffff812a34d8>] clear_user+0x38/0x3c
                 [<ffffffff81167e16>] padzero+0x20/0x31
                 [<ffffffff81168b47>] load_elf_binary+0x8bc/0x17ed
                 [<ffffffff81130e95>] search_binary_handler+0xc2/0x259
                 [<ffffffff81166d64>] load_script+0x1b8/0x1cc
                 [<ffffffff81130e95>] search_binary_handler+0xc2/0x259
                 [<ffffffff8113255f>] do_execve+0x1ce/0x2cf
                 [<ffffffff81027494>] sys_execve+0x43/0x5a
                 [<ffffffff8102918a>] stub_execve+0x6a/0xc0
          -> #0 (&mm->mmap_sem){++++++}:
                 [<ffffffff81099aa4>] __lock_acquire+0xa11/0xd0f
                 [<ffffffff81099e7e>] lock_acquire+0xdc/0x102
                 [<ffffffff81107251>] might_fault+0x89/0xac
                 [<ffffffff81139382>] fiemap_fill_next_extent+0x95/0xda
                 [<ffffffff811bcb43>] ext4_ext_fiemap_cb+0x138/0x157
                 [<ffffffff811be069>] ext4_ext_walk_space+0x178/0x1f1
                 [<ffffffff811be21e>] ext4_fiemap+0x13c/0x159
                 [<ffffffff811390e6>] do_vfs_ioctl+0x348/0x4d6
                 [<ffffffff811392ca>] sys_ioctl+0x56/0x79
                 [<ffffffff81028cb2>] system_call_fastpath+0x16/0x1b
          other info that might help us debug this:
          1 lock held by ureadahead/1855:
           #0:  (&ei->i_data_sem){++++..}, at: [<ffffffff811be1fd>] ext4_fiemap+0x11b/0x159
          stack backtrace:
          Pid: 1855, comm: ureadahead Not tainted 2.6.32-04115-gec044c5 #37
          Call Trace:
           [<ffffffff81098c70>] print_circular_bug+0xa8/0xb7
           [<ffffffff81099aa4>] __lock_acquire+0xa11/0xd0f
           [<ffffffff8102f229>] ? sched_clock+0x9/0xd
           [<ffffffff81099e7e>] lock_acquire+0xdc/0x102
           [<ffffffff81107224>] ? might_fault+0x5c/0xac
           [<ffffffff81107251>] might_fault+0x89/0xac
           [<ffffffff81107224>] ? might_fault+0x5c/0xac
           [<ffffffff81124b44>] ? __kmalloc+0x13b/0x18c
           [<ffffffff81139382>] fiemap_fill_next_extent+0x95/0xda
           [<ffffffff811bcb43>] ext4_ext_fiemap_cb+0x138/0x157
           [<ffffffff811bca0b>] ? ext4_ext_fiemap_cb+0x0/0x157
           [<ffffffff811be069>] ext4_ext_walk_space+0x178/0x1f1
           [<ffffffff811be21e>] ext4_fiemap+0x13c/0x159
           [<ffffffff81107224>] ? might_fault+0x5c/0xac
           [<ffffffff811390e6>] do_vfs_ioctl+0x348/0x4d6
           [<ffffffff8129f6d0>] ? __up_read+0x8d/0x95
           [<ffffffff81517fb5>] ? retint_swapgs+0x13/0x1b
           [<ffffffff811392ca>] sys_ioctl+0x56/0x79
           [<ffffffff81028cb2>] system_call_fastpath+0x16/0x1b
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>