1. 24 10月, 2008 31 次提交
    • K
      PCI hotplug: cpqphp: fix kernel NULL pointer dereference · d2174c3c
      Kenji Kaneshige 提交于
      The following patch fixes the regression in 2.6.27 that causes kernel
      NULL pointer dereference at cpqphp driver probe time.  This patch should
      be backported to the .27 stable series.
      
      Seems to have been introduced by
      f46753c5.
      
      The root cause of this problem seems that cpqphp driver calls
      pci_hp_register() wrongly. In current implementation, cpqphp driver
      passes 'ctrl->pci_dev->subordinate' as a second parameter for
      pci_hp_register(). But because hotplug slots and it's hotplug controller
      (exists as a pci funcion) are on the same bus, it should be
      'ctrl->pci_dev->bus' instead.
      
      Cc: <stable@kernel.org>
      Tested-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
      Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      d2174c3c
    • L
      compat_blkdev_driver_ioctl: Remove unused variable warning · 5f4f0c4d
      Linus Torvalds 提交于
      Variable 'ret' is no longer used. Don't declare it.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5f4f0c4d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 54d822a6
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: Fix GPIO initcall breakage
        avr32: Scale loops_per_jiffy when cpu frequency changes
        avr32: Fix bug in LCD pin setup on port C
        avr32: Add defconfig for the favr-32 board
        avr32: Add defconfig for the mimc200 board
        avr32: Add MIMC200 board support
        avr32: Fix MIMC200 board use of SPD network pins
        avr32: add support for EarthLCD Favr-32 board
        avr32: Add support for EVKLCD10X addon boards
        avr32: Kconfig: Remove pointless if around atstk1000 include
      54d822a6
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev · 22484856
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev: (66 commits)
        [PATCH] kill the rest of struct file propagation in block ioctls
        [PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET
        [PATCH] get rid of blkdev_locked_ioctl()
        [PATCH] get rid of blkdev_driver_ioctl()
        [PATCH] sanitize blkdev_get() and friends
        [PATCH] remember mode of reiserfs journal
        [PATCH] propagate mode through swsusp_close()
        [PATCH] propagate mode through open_bdev_excl/close_bdev_excl
        [PATCH] pass fmode_t to blkdev_put()
        [PATCH] kill the unused bsize on the send side of /dev/loop
        [PATCH] trim file propagation in block/compat_ioctl.c
        [PATCH] end of methods switch: remove the old ones
        [PATCH] switch sr
        [PATCH] switch sd
        [PATCH] switch ide-scsi
        [PATCH] switch tape_block
        [PATCH] switch dcssblk
        [PATCH] switch dasd
        [PATCH] switch mtd_blkdevs
        [PATCH] switch mmc
        ...
      22484856
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 5ed487bc
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (46 commits)
        [PATCH] fs: add a sanity check in d_free
        [PATCH] i_version: remount support
        [patch] vfs: make security_inode_setattr() calling consistent
        [patch 1/3] FS_MBCACHE: don't needlessly make it built-in
        [PATCH] move executable checking into ->permission()
        [PATCH] fs/dcache.c: update comment of d_validate()
        [RFC PATCH] touch_mnt_namespace when the mount flags change
        [PATCH] reiserfs: add missing llseek method
        [PATCH] fix ->llseek for more directories
        [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent
        [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup
        [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate()
        [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper
        [PATCH vfs-2.6 2/6] vfs: add d_ancestor()
        [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT()
        [PATCH] get rid of on-stack dentry in udf
        [PATCH 2/2] anondev: switch to IDA
        [PATCH 1/2] anondev: init IDR statically
        [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup()
        [PATCH] Optimise NFS readdir hack slightly.
        ...
      5ed487bc
    • L
      Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 5b346539
      Linus Torvalds 提交于
      * 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
        x86: canonicalize remaining header guards
        x86: drop double underscores from header guards
        x86: Fix ASM_X86__ header guards
        x86, um: get rid of uml-config.h
        x86, um: get rid of arch/um/Kconfig.arch
        x86, um: get rid of arch/um/os symlink
        x86, um: get rid of excessive includes of uml-config.h
        x86, um: get rid of header symlinks
        x86, um: merge Kconfig.i386 and Kconfig.x86_64
        x86, um: get rid of sysdep symlink
        x86, um: trim the junk from uml ptrace-*.h
        x86, um: take vm-flags.h to sysdep
        x86, um: get rid of uml asm/arch
        x86, um: get rid of uml highmem.h
        x86, um: get rid of uml unistd.h
        x86, um: get rid of system.h -> system.h include
        x86, um: uml atomic.h is not needed anymore
        x86, um: untangle uml ldt.h
        x86, um: get rid of more uml asm/arch uses
        x86, um: remove dead header (uml module-generic.h; never used these days)
        ...
      5b346539
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 765426e8
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
        dock: make dock driver not a module
        ACPI: fix ia64 build warning
        ACPI: hack around sysfs warning with link order
        ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
        intel_menlo: fix build warning
        panasonic-laptop: fix build
        ACPICA: Update version to 20080926
        ACPICA: Add support for zero-length buffer-to-string conversions
        ACPICA: New: Validation for predefined ACPI methods/objects
        ACPICA: Fix for implicit return compatibility
        ACPICA: Fixed a couple memory leaks associated with "implicit return"
        ACPICA: Optimize buffer allocation procedure
        ACPICA: Fix possible memory leak, error exit path
        ACPICA: Fix fault after mem allocation failure in AML parser
        ACPICA: Remove unused ACPI register bit definition
        ACPICA: Update version to 20080829
        ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
        ACPICA: Cleanup for internal Reference Object
        ACPICA: Update comments - no functional changes
        ACPICA: Update for Reference ACPI_OPERAND_OBJECT
        ...
      765426e8
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 36ec8918
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
        sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().
        sh: mach-highlander: Handle SCIF pinmuxing on R7785RP.
        sh: sh7785 pinmux support
        sh: update defconfigs.
        sh: Kill off unused p1fc divisors from SH7763 clk fwk.
        sh: improve pinmux support for single direction pins
        sh: use 10MHz VIO_CLK for ov772x on Migo-R
        sh: Update gpio_set_value() pin value handling
        sh: update ov772x byte order on Migo-R
        rtc: Add R2025S/D comment to rs5c372 Kconfig entry.
        sh: Export cache flush routines needed by sh_eth on SH7619.
        sh: Wire up oops reporting in the die notifier chain.
        sh: ap325rxa: Kill off unused port definitions.
        sh: Hook up PB0->PB7 input-only pins in SH7203 PFC.
        sh: ap325rxa: Move off of hardcoded pinmux for flctl initialization.
        sh: add support FLCTL for ap325rxa board
        sh: gpio: Stub in dummy GPIO<->IRQ mapping routines.
        sh: rsk7203: leds-gpio support for RSK+ LEDs.
        sh: gpio: Include asm-generic/gpio.h for non-gpiolib stubs.
        sh: fix soc-camera compile breakage on Migo-R.
        ...
      36ec8918
    • L
      Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 70740d6c
      Linus Torvalds 提交于
      * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
        drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
        drm/i915: use pipes, not planes to label vblank data
        drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
        i915: Fix format string warnings on x86-64.
        i915: Don't dereference HWS in /proc debug files when it isn't initialized.
        i915: Enable IMR passthrough of vblank events before enabling it in pipestat.
        drm: Remove two leaks of vblank reference count in error paths.
        drm: fix leak of cliprects in drm_rmdraw()
        i915: Disable MSI on GM965 (errata says it doesn't work)
        drm: Set cliprects to NULL when changing drawable to having 0 cliprects.
        i915: Protect vblank IRQ reg access with spinlock
      70740d6c
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · a3415dc3
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (32 commits)
        PCI hotplug: fix logic in Compaq hotplug controller bus speed setup
        PCI: don't export linux/io.h from pci.h
        PCI: PCI_QUIRKS depends on PCI
        PCI hotplug: pciehp: poll data link layer link active
        PCI hotplug: pciehp: fix possible memory leak in pcie_init
        PCI: Workaround invalid P2P bridge bus numbers
        PCI Hotplug: fakephp: add duplicate slot name debugging
        PCI: Hotplug core: remove 'name'
        PCI: shcphp: remove 'name' parameter
        PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
        PCI: rpaphp: kmalloc/kfree slot->name directly
        PCI: pciehp: remove 'name' parameter
        PCI: ibmphp: stop managing hotplug_slot->name
        PCI: fakephp: remove 'name' parameter
        PCI, PCI Hotplug: introduce slot_name helpers
        PCI: cpqphp: stop managing hotplug_slot->name
        PCI: cpci_hotplug: stop managing hotplug_slot->name
        PCI: acpiphp: remove 'name' parameter
        PCI: prevent duplicate slot names
        PCI Hotplug: serialize pci_hp_register and pci_hp_deregister
        ...
      a3415dc3
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · b4d0b08a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: fix sparse warnings
        9p: rdma: RDMA Transport Support for 9P
        9p: fix format warning
        9p: fix debug build error
      b4d0b08a
    • L
      Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux · 33217379
      Linus Torvalds 提交于
      * 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
        nfsd: clean up expkey_parse error cases
        nfsd: Drop reference in expkey_parse error cases
        nfsd: Fix memory leak in nfsd_getxattr
        NFSD: Fix BUG during NFSD shutdown processing
      33217379
    • L
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · feeedc6c
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Add info->archdata field
        i2c: Inform about deprecated chips directory
        i2c: Use pci_ioremap_bar()
        Schedule removal of the legacy i2c device driver binding model
        i2c: Clean up <linux/i2c.h>
        i2c: Update and clean up writing-clients document
        i2c: Drop 2-byte address block transfer defines
        i2c: Delete legacy model documentation
        i2c: Constify i2c_get_clientdata's parameter
        i2c: Delete outdated client porting guide
        i2c: Make clear what the class field of i2c_adapter is good for
        i2c-algo-pcf: Fix typo in debugging log message
        i2c-algo-pcf: Add adapter hooks around xfer begin and end
        i2c-algo-pcf: Pass adapter data into ->waitforpin() method
        i2c-i801: Add support for Intel Ibex Peak
      feeedc6c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · a2702834
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        USB: don't rebind drivers after failed resume or reset
        USB: fix memory leak in cdc-acm
        USB: Unusual dev for Mio moov 330 gps
        USB: cdc-wdm: make module autoload work
        USB: Fix unneeded endpoint check in pxa27x_udc
        usb/gadget: fix kernel-doc warning
        USB: Speedtouch: add pre_reset and post_reset routines
        USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative
        USB: support Huawei data card product IDs
        USB: add ZTE MF626 USB GSM modem entry
        USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge
        USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc
        USB: ohci: add support for tmio-ohci cell
      a2702834
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 45432371
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (42 commits)
        Staging: usbip: fix build warning on 64bit kernels
        Staging: me4000: remove some compiler warnings
        Staging: wbusb: fix a bunch of compiler warnings
        Staging: w35und: module init cleanup
        Staging: w35und: use gotos for error handling
        Staging: w35und: remove spinlock wrappers
        Staging: sxg: fix compiler warnings.
        Staging: sxg: fix up unused function warnings
        Staging: sxg: clean up C99 comments
        Staging: Lindent the echo driver
        Staging: SLICOSS: Free multicast list at driver exit
        Staging: PCC-ACPI: Fix all checkpatch errors
        Staging: pcc-acpi: update to latest version
        Staging: Clean up sxg driver
        Staging: remove remaining uses of __FUNCTION__
        Staging: add poch driver
        Staging: wlan-ng: fix build error if wireless networking is not enabled
        Staging: echo: remove annoying "end of function" markers
        Staging: echo: remove __cplusplus macro magic
        Staging: echo: remove dead code
        ...
      45432371
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile · 92fb83af
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (21 commits)
        OProfile: Fix buffer synchronization for IBS
        oprofile: hotplug cpu fix
        oprofile: fixing whitespaces in arch/x86/oprofile/*
        oprofile: fixing whitespaces in arch/x86/oprofile/*
        oprofile: fixing whitespaces in drivers/oprofile/*
        x86/oprofile: add the logic for enabling additional IBS bits
        x86/oprofile: reordering functions in nmi_int.c
        x86/oprofile: removing unused function parameter in add_ibs_begin()
        oprofile: more whitespace fixes
        oprofile: whitespace fixes
        OProfile: Rename IBS sysfs dir into "ibs_op"
        OProfile: Rework string handling in setup_ibs_files()
        OProfile: Rework oprofile_add_ibs_sample() function
        oprofile: discover counters for op ppro too
        oprofile: Implement Intel architectural perfmon support
        oprofile: Don't report Nehalem as core_2
        oprofile: drop const in num counters field
        Revert "Oprofile Multiplexing Patch"
        x86, oprofile: BUG: using smp_processor_id() in preemptible code
        x86/oprofile: fix on_each_cpu build error
        ...
      
      Manually fixed trivial conflicts in
      	drivers/oprofile/{cpu_buffer.c,event_buffer.h}
      92fb83af
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · a5344876
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        stop_machine: fix error code handling on multiple cpus
        stop_machine: use workqueues instead of kernel threads
        workqueue: introduce create_rt_workqueue
        Call init_workqueues before pre smp initcalls.
        Make panic= and panic_on_oops into core_params
        Make initcall_debug a core_param
        core_param() for genuinely core kernel parameters
        param: Fix duplicate module prefixes
        module: check kernel param length at compile time, not runtime
        Remove stop_machine during module load v2
        module: simplify load_module.
      a5344876
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 296e1ce0
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (36 commits)
        V4L/DVB (9336): cx88: always de-alloc frontends on fault condition
        V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator
        V4L/DVB (9334): cx88: dvb_remove debug output
        V4L/DVB (9333): cx88: Not all boards that requires cx88-mpeg has frontends
        V4L/DVB (9332): cx88: initial fix for analogue only compilation
        V4L/DVB (9331): Remove unused inode parameter from video_ioctl2
        V4L/DVB (9330): Get rid of inode parameter at v4l_compat_translate_ioctl()
        V4L/DVB (9328): ivtvfb: FB_BLANK_POWERDOWN turns off video output
        V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d
        V4L/DVB (9326): ivtv: avoid green flashing when loading ivtv
        V4L/DVB (9325): ivtv: switch to unlocked_ioctl.
        V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support.
        V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls.
        V4L/DVB (9322): v4l2-int-if: Export more interfaces to modules
        V4L/DVB (9321): v4l2-int-if: Define new power state changes
        V4L/DVB (9320): v4l2: Add 10-bit RAW Bayer formats
        V4L/DVB (9319): v4l2-int-if: Add cropcap, g_crop and s_crop commands.
        V4L/DVB (9318): v4l2-int-if: Add command to get slave private data.
        V4L/DVB (9316): s5h1411: Power down s5h1411 when not in use
        V4L/DVB (9315): s5h1411: Skip reconfiguring demod modulation if already at the desired modulation
        ...
      296e1ce0
    • L
      Merge branch 'v28-timers-for-linus' of... · b14ea38e
      Linus Torvalds 提交于
      Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        NOHZ: fix thinko in the timer restart code path
      b14ea38e
    • L
      Merge git://git.infradead.org/iommu-2.6 · 6770ab5c
      Linus Torvalds 提交于
      * git://git.infradead.org/iommu-2.6:
        Admit to maintaining VT-d, for my sins.
        dmar: fix uninitialised 'ret' variable in dmar_parse_dev()
        intel-iommu: use coherent_dma_mask in alloc_coherent
        amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors
        intel-iommu: IA64 support
        dmar: remove the quirk which disables dma-remapping when intr-remapping enabled
        dmar: Use queued invalidation interface for IOTLB and context invalidation
        dmar: context cache and IOTLB invalidation using queued invalidation
        dmar: use spin_lock_irqsave() in qi_submit_sync()
      6770ab5c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 326528a5
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide: remove useless subdirs from drivers/ide/
      326528a5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · 3e5cce62
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
        dm: tidy local_init
        dm: remove unused flush_all
        dm raid1: separate region_hash interface part1
        dm: mark split bio as cloned
        dm crypt: remove waitqueue
        dm crypt: fix async split
        dm crypt: tidy sector
        dm: remove dm header from targets
        dm: publish array_too_big
        dm exception store: fix misordered writes
        dm exception store: refactor zero_area
        dm snapshot: drop unused last_percent
        dm snapshot: fix primary_pe race
        dm kcopyd: avoid queue shuffle
      3e5cce62
    • L
      Merge branch 'core-fixes-for-linus' of... · f2e4bd2b
      Linus Torvalds 提交于
      Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcupdate: fix bug of rcu_barrier*()
        profiling: fix !procfs build
      
      Fixed trivial conflicts in 'include/linux/profile.h'
      f2e4bd2b
    • L
      Merge branch 'sched-fixes-for-linus' of... · 133e887f
      Linus Torvalds 提交于
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: disable the hrtick for now
        sched: revert back to per-rq vruntime
        sched: fair scheduler should not resched rt tasks
        sched: optimize group load balancer
        sched: minor fast-path overhead reduction
        sched: fix the wrong mask_len, cleanup
        sched: kill unused scheduler decl.
        sched: fix the wrong mask_len
        sched: only update rq->clock while holding rq->lock
      133e887f
    • L
      Merge branch 'irq-fixes-for-linus' of... · e82cff75
      Linus Torvalds 提交于
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: NULL struct irq_desc's member 'name' in dynamic_irq_cleanup()
        genirq: fix off by one and coding style
        genirq: fix set_irq_type() when recording trigger type
      e82cff75
    • L
      8250: Add more OxSemi devices · b80de369
      Lee Howard 提交于
      These have the Mainpine PCI identifier on however
      
      Additional paranoia check for Tornado versions added by Alan Cox
      
      (and this time I remembered to do an stg refresh so that the corrections ended
       up in these patches not randomly attached to another diff -- Alan)
      Signed-off-by: NLee Howard <lee.howard@mainpine.com>
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b80de369
    • L
      8250: Oxford Semiconductor Devices · 7106b4e3
      Lee Howard 提交于
      Add support for the OxSemi 'Tornado' devices.
      
      Reformatted and reworked a bit by Alan Cox
      Signed-off-by: NLee Howard <lee.howard@mainpine.com>
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7106b4e3
    • A
      tty: Fix tty_port kref screwup · cb4bca35
      Alan Cox 提交于
      Pass the brown paper bags please. I changed the semantics of this so the
      function was supposed to do the extra kref itself then forgot to do the
      change.. duh....
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cb4bca35
    • A
      watchdog: Fix warning · 7dc9b48f
      Alan Cox 提交于
      This seems to have popped up after the recent merges:
      
      drivers/watchdog/w83697ug_wdt.c: In function ‘w83697ug_select_wd_register’:
      drivers/watchdog/w83697ug_wdt.c:105: warning: ‘return’ with a value, in function returning void
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Acked-by: NWim Van Sebroeck <wim@iguana.be>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7dc9b48f
    • N
      mutex: speed up generic mutex implementations · a8ddac7e
      Nick Piggin 提交于
      - atomic operations which both modify the variable and return something imply
        full smp memory barriers before and after the memory operations involved
        (failing atomic_cmpxchg, atomic_add_unless, etc don't imply a barrier because
        they don't modify the target). See Documentation/atomic_ops.txt.
        So remove extra barriers and branches.
      
      - All architectures support atomic_cmpxchg. This has no relation to
        __HAVE_ARCH_CMPXCHG. We can just take the atomic_cmpxchg path unconditionally
      
      This reduces a simple single threaded fastpath lock+unlock test from 590 cycles
      to 203 cycles on a ppc970 system.
      Signed-off-by: NNick Piggin <npiggin@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a8ddac7e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 · 5a439c56
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
        xtensa: Add config files for Diamond 232L - Rev B processor variant
        xtensa: Fix io regions
        xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
        xtensa: replace remaining __FUNCTION__ occurrences
        xtensa: use newer __SPIN_LOCK_UNLOCKED macro
        XTENSA: warn about including <asm/rwsem.h> directly.
      5a439c56
  2. 23 10月, 2008 9 次提交
    • K
      memcg: fix page_cgroup allocation · 94b6da5a
      KAMEZAWA Hiroyuki 提交于
      page_cgroup_init() is called from mem_cgroup_init(). But at this
      point, we cannot call alloc_bootmem().
      (and this caused panic at boot.)
      
      This patch moves page_cgroup_init() to init/main.c.
      
      Time table is following:
      ==
        parse_args(). # we can trust mem_cgroup_subsys.disabled bit after this.
        ....
        cgroup_init_early()  # "early" init of cgroup.
        ....
        setup_arch()         # memmap is allocated.
        ...
        page_cgroup_init();
        mem_init();   # we cannot call alloc_bootmem after this.
        ....
        cgroup_init() # mem_cgroup is initialized.
      ==
      
      Before page_cgroup_init(), mem_map must be initialized. So,
      I added page_cgroup_init() to init/main.c directly.
      
      (*) maybe this is not very clean but
          - cgroup_init_early() is too early
          - in cgroup_init(), we have to use vmalloc instead of alloc_bootmem().
          use of vmalloc area in x86-32 is important and we should avoid very large
          vmalloc() in x86-32. So, we want to use alloc_bootmem() and added page_cgroup_init()
          directly to init/main.c
      
      [akpm@linux-foundation.org: remove unneeded/bad mem_cgroup_subsys declaration]
      [akpm@linux-foundation.org: fix build]
      Acked-by: NBalbir Singh <balbir@linux.vnet.ibm.com>
      Tested-by: NBalbir Singh <balbir@linux.vnet.ibm.com>
      Signed-off-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      94b6da5a
    • D
      jbd: abort instead of waiting for nonexistent transactions · be07c4ed
      Duane Griffin 提交于
      The __log_wait_for_space function sits in a loop checkpointing
      transactions until there is sufficient space free in the journal.
      However, if there are no transactions to be processed (e.g.  because the
      free space calculation is wrong due to a corrupted filesystem) it will
      never progress.
      
      Check for space being required when no transactions are outstanding and
      abort the journal instead of endlessly looping.
      
      This patch fixes the bug reported by Sami Liedes at:
      http://bugzilla.kernel.org/show_bug.cgi?id=10976Signed-off-by: NDuane Griffin <duaneg@dghda.com>
      Tested-by: NSami Liedes <sliedes@cc.hut.fi>
      Cc: <linux-ext4@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      be07c4ed
    • H
      jbd: test BH_Write_EIO to detect errors on metadata buffers · 9f818b4a
      Hidehiro Kawai 提交于
      __try_to_free_cp_buf(), __process_buffer(), and __wait_cp_io() test
      BH_Uptodate flag to detect write I/O errors on metadata buffers.  But by
      commit 95450f5a "ext3: don't read inode
      block if the buffer has a write error"(*), BH_Uptodate flag can be set to
      inode buffers with BH_Write_EIO in order to avoid reading old inode data.
      So now, we have to test BH_Write_EIO flag of checkpointing inode buffers
      instead of BH_Uptodate.  This patch does it.
      Signed-off-by: NHidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
      Acked-by: NJan Kara <jack@suse.cz>
      Acked-by: NEric Sandeen <sandeen@redhat.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9f818b4a
    • H
      ext3: add checks for errors from jbd · 2d7c820e
      Hidehiro Kawai 提交于
      If the journal has aborted due to a checkpointing failure, we have to
      keep the contents of the journal space.  Otherwise, the filesystem will
      lose uncheckpointed metadata completely and become inconsistent.  To
      avoid this, we need to keep needs_recovery flag if checkpoint has
      failed.
      
      With this patch, ext3_put_super() detects a checkpointing failure from
      the return value of journal_destroy(), then it invokes ext3_abort() to
      make the filesystem read only and keep needs_recovery flag.  Errors
      from journal_flush() are also handled by this patch in some places.
      Signed-off-by: NHidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
      Cc: Jan Kara <jack@ucw.cz>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: <linux-ext4@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2d7c820e
    • H
      jbd: fix error handling for checkpoint io · 4afe9785
      Hidehiro Kawai 提交于
      When a checkpointing IO fails, current JBD code doesn't check the error
      and continue journaling.  This means latest metadata can be lost from both
      the journal and filesystem.
      
      This patch leaves the failed metadata blocks in the journal space and
      aborts journaling in the case of log_do_checkpoint().  To achieve this, we
      need to do:
      
      1. don't remove the failed buffer from the checkpoint list where in
         the case of __try_to_free_cp_buf() because it may be released or
         overwritten by a later transaction
      2. log_do_checkpoint() is the last chance, remove the failed buffer
         from the checkpoint list and abort the journal
      3. when checkpointing fails, don't update the journal super block to
         prevent the journaled contents from being cleaned.  For safety,
         don't update j_tail and j_tail_sequence either
      4. when checkpointing fails, notify this error to the ext3 layer so
         that ext3 don't clear the needs_recovery flag, otherwise the
         journaled contents are ignored and cleaned in the recovery phase
      5. if the recovery fails, keep the needs_recovery flag
      6. prevent cleanup_journal_tail() from being called between
         __journal_drop_transaction() and journal_abort() (a race issue
         between journal_flush() and __log_wait_for_space()
      Signed-off-by: NHidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
      Acked-by: NJan Kara <jack@suse.cz>
      Cc: <linux-ext4@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4afe9785
    • P
      profiling: fix up CONFIG_PROC_FS=n build · 66f50ee3
      Paul Mundt 提交于
      In the case where procfs is disabled, create_proc_profile() does not
      exist. Stub it in with the others.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      66f50ee3
    • P
      mm: page_cgroup needs linux/vmalloc.h for vmalloc_node()/vfree(). · 4c821042
      Paul Mundt 提交于
      mm/page_cgroup.c: In function 'init_section_page_cgroup':
      mm/page_cgroup.c:111: error: implicit declaration of function 'vmalloc_node'
      mm/page_cgroup.c:111: warning: assignment makes pointer from integer without a cast
      mm/page_cgroup.c: In function '__free_page_cgroup':
      mm/page_cgroup.c:140: error: implicit declaration of function 'vfree'
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      Reviewed-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4c821042
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 9bf9b2f3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (53 commits)
        powerpc: Support for relocatable kdump kernel
        powerpc: Don't use a 16G page if beyond mem= limits
        powerpc: Add del_node() for early boot code to prune inapplicable devices.
        powerpc: Further compile fixup for STRICT_MM_TYPECHECKS
        powerpc: Remove empty #else from signal_64.c
        powerpc: Move memory size print into common show_cpuinfo for 32-bit
        hvc_console: Remove __devexit annotation of hvc_remove()
        hvc_console: Add support for tty window resizing
        hvc_console: Fix loop if put_char() returns 0
        hvc_console: Add tty driver flag TTY_DRIVER_RESET_TERMIOS
        hvc_console: Add a hangup notifier for backends
        powerpc/83xx: Add DS1339 RTC support for MPC8349E-mITX boards .dts
        powerpc/83xx: Add support for MCU microcontroller in .dts files
        powerpc/85xx: Move mpc8572ds.dts to address-cells/size-cells = <2>
        of/spi: Support specifying chip select as active high via device tree
        powerpc: Remove device_type = "board_control" properties in .dts files
        i2c-cpm: Suppress autoprobing for devices
        powerpc/85xx: Fix mpc8536ds dma interrupt numbers
        powerpc/85xx: Enable enhanced functions for 8536 TSEC
        powerpc: Delete unused prom_strtoul and prom_memparse
        ...
      9bf9b2f3
    • L
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb · 9779a832
      Linus Torvalds 提交于
      * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb: (47 commits)
        uwb: wrong sizeof argument in mac address compare
        uwb: don't use printk_ratelimit() so often
        uwb: use kcalloc where appropriate
        uwb: use time_after() when purging stale beacons
        uwb: add credits for the original developers of the UWB/WUSB/WLP subsystems
        uwb: add entries in the MAINTAINERS file
        uwb: depend on EXPERIMENTAL
        wusb: wusb-cbaf (CBA driver) sysfs ABI simplification
        uwb: document UWB and WUSB sysfs files
        uwb: add symlinks in sysfs between radio controllers and PALs
        uwb: dont tranmit identification IEs
        uwb: i1480/GUWA100U: fix firmware download issues
        uwb: i1480: remove MAC/PHY information checking function
        uwb: add Intel i1480 HWA to the UWB RC quirk table
        uwb: disable command/event filtering for D-Link DUB-1210
        uwb: initialize the debug sub-system
        uwb: Fix handling IEs with empty IE data in uwb_est_get_size()
        wusb: fix bmRequestType for Abort RPipe request
        wusb: fix error path for wusb_set_dev_addr()
        wusb: add HWA host controller driver
        ...
      9779a832