1. 07 Aug, 2010 1 commit
    • Eric Millbrandt's avatar
      powerpc/5200: add mpc5200_psc_ac97_gpio_reset · cfa6a88c
      Eric Millbrandt authored
      Work around a silicon bug in the ac97 reset functionality of the
      mpc5200(b).  The implementation of the ac97 "cold" reset is flawed.
      If the sync and output lines are high when reset is asserted the
      attached ac97 device may go into test mode.  Avoid this by
      reconfiguring the psc to gpio mode and generating the reset manually.
      
      From MPC5200B User's Manual:
      "Some AC97 devices goes to a test mode, if the Sync line is high
      during the Res line is low (reset phase). To avoid this behavior the
      Sync line must be also forced to zero during the reset phase. To do
      that, the pin muxing should switch to GPIO mode and the GPIO control
      register should be used to control the output lines."
      Signed-off-by: default avatarEric Millbrandt <emillbrandt@dekaresearch.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      cfa6a88c
  2. 06 Aug, 2010 27 commits
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · 17879857
      Linus Torvalds authored
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        xen: Do not suspend IPI IRQs.
        powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts
        ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt
        irq: Add new IRQ flag IRQF_NO_SUSPEND
      17879857
    • Linus Torvalds's avatar
      Merge branch 'timers-timekeeping-for-linus' of... · b62ad9ab
      Linus Torvalds authored
      Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        um: Fix read_persistent_clock fallout
        kgdb: Do not access xtime directly
        powerpc: Clean up obsolete code relating to decrementer and timebase
        powerpc: Rework VDSO gettimeofday to prevent time going backwards
        clocksource: Add __clocksource_updatefreq_hz/khz methods
        x86: Convert common clocksources to use clocksource_register_hz/khz
        timekeeping: Make xtime and wall_to_monotonic static
        hrtimer: Cleanup direct access to wall_to_monotonic
        um: Convert to use read_persistent_clock
        timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
        powerpc: Cleanup xtime usage
        powerpc: Simplify update_vsyscall
        time: Kill off CONFIG_GENERIC_TIME
        time: Implement timespec_add
        x86: Fix vtime/file timestamp inconsistencies
      
      Trivial conflicts in Documentation/feature-removal-schedule.txt
      
      Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as
      per Thomas' earlier merge commit 47916be4 ("Merge branch
      'powerpc.cherry-picks' into timers/clocksource")
      b62ad9ab
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · af390084
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        Documentation: Add timers/timers-howto.txt
        timer: Added usleep_range timer
        Revert "timer: Added usleep[_range] timer"
        clockevents: Remove the per cpu tick skew
        posix_timer: Move copy_to_user(created_timer_id) down in timer_create()
        timer: Added usleep[_range] timer
        timers: Document meaning of deferrable timer
      af390084
    • H. Peter Anvin's avatar
      x86, kvm: Remove cast obsoleted by set_64bit() prototype cleanup · 7645e432
      H. Peter Anvin authored
      KVM ended up having to put a pretty ugly wrapper around set_64bit()
      in order to get the type right.  Now set_64bit() takes the expected
      u64 type, and this wrapper can be cleaned up.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Cc: Avi Kivity <avi@redhat.com>
      LKML-Reference: <4C5C4E7A.8040603@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7645e432
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 1685e633
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
        pcmcia: do not request windows if you don't need to
        pcmcia: insert PCMCIA device resources into resource tree
        pcmcia: export resource information to sysfs
        pcmcia: use struct resource for PCMCIA devices, part 2
        pcmcia: remove memreq_t
        pcmcia: move local definitions out of include/pcmcia/cs.h
        pcmcia: do not use io_req_t when calling pcmcia_request_io()
        pcmcia: do not use io_req_t after call to pcmcia_request_io()
        pcmcia: use struct resource for PCMCIA devices
        pcmcia: clean up cs.h
        pcmcia: use pcmica_{read,write}_config_byte
        pcmcia: remove cs_types.h
        pcmcia: remove unused flag, simplify headers
        pcmcia: remove obsolete CS_EVENT_ definitions
        pcmcia: split up central event handler
        pcmcia: simplify event callback
        pcmcia: remove obsolete ioctl
      
      Conflicts in:
       - drivers/staging/comedi/drivers/*
       - drivers/staging/wlags49_h2/wl_cs.c
      due to dev_info_t and whitespace changes
      1685e633
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 1cfd2bda
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (30 commits)
        PCI: update for owner removal from struct device_attribute
        PCI: Fix warnings when CONFIG_DMI unset
        PCI: Do not run NVidia quirks related to MSI with MSI disabled
        x86/PCI: use for_each_pci_dev()
        PCI: use for_each_pci_dev()
        PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()
        PCI: export SMBIOS provided firmware instance and label to sysfs
        PCI: Allow read/write access to sysfs I/O port resources
        x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN
        PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}
        PCI: disable mmio during bar sizing
        PCI: MSI: Remove unsafe and unnecessary hardware access
        PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable
        PCI: kernel oops on access to pci proc file while hot-removal
        PCI: pci-sysfs: remove casts from void*
        ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
        PCI hotplug: make sure child bridges are enabled at hotplug time
        PCI hotplug: shpchp: Removed check for hotplug of display devices
        PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device
        PCI: Don't enable aspm before drivers have had a chance to veto it
        ...
      1cfd2bda
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · b57bdda5
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: Allow removal of slab caches during boot
        Revert "slub: Allow removal of slab caches during boot"
        slub numa: Fix rare allocation from unexpected node
        slab: use deferable timers for its periodic housekeeping
        slub: Use kmem_cache flags to detect if slab is in debugging mode.
        slub: Allow removal of slab caches during boot
        slub: Check kasprintf results in kmem_cache_init()
        SLUB: Constants need UL
        slub: Use a constant for a unspecified node.
        SLOB: Free objects to their own list
        slab: fix caller tracking on !CONFIG_DEBUG_SLAB && CONFIG_TRACING
      b57bdda5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · cc41f5ce
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (524 commits)
        Staging: wlan-ng: Update prism2_set_tx_power() to use mBm
        Staging: ti-st: update TODO
        Staging: wlags49_h2: use common PCI_VENDOR/DEVICE_ID name format
        Staging: comedi : fix brace coding style issue in wwrap.c
        Staging: quatech_usb2: remove unused qt2_box_flush function
        Staging: slicoss: Remove net_device_stats from the driver's private
        staging: rtl8192su: check whether requests succeeded
        staging: panel: fix error path
        staging: otus: check kmalloc() return value
        staging: octeon: check request_irq() return value
        Staging: wlan-ng: remove typedef in p80211hdr.h
        Staging: wlan-ng: fix checkpatch issues in headers.
        Staging: wlan-ng: remove typedef in p80211ioctl.h
        Staging: wlan-ng: fix style issues in p80211conv.h
        Staging: wlan-ng: fix style issues for p80211hdr.h
        staging: vt6656: removed NTSTATUS definition
        staging: vt6656: simplified tests involving both multi/broad-casts
        Staging: vt6655: replace BOOL with in kernel bool
        Staging: vt6655: replace FALSE with in kernel false
        Staging: vt6655: replace TRUE with in kernel true
        ...
      cc41f5ce
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · ab69bcd6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (28 commits)
        driver core: device_rename's new_name can be const
        sysfs: Remove owner field from sysfs struct attribute
        powerpc/pci: Remove owner field from attribute initialization in PCI bridge init
        regulator: Remove owner field from attribute initialization in regulator core driver
        leds: Remove owner field from attribute initialization in bd2802 driver
        scsi: Remove owner field from attribute initialization in ARCMSR driver
        scsi: Remove owner field from attribute initialization in LPFC driver
        cgroupfs: create /sys/fs/cgroup to mount cgroupfs on
        Driver core: Add BUS_NOTIFY_BIND_DRIVER
        driver core: fix memory leak on one error path in bus_register()
        debugfs: no longer needs to depend on SYSFS
        sysfs: Fix one more signature discrepancy between sysfs implementation and docs.
        sysfs: fix discrepancies between implementation and documentation
        dcdbas: remove a redundant smi_data_buf_free in dcdbas_exit
        dmi-id: fix a memory leak in dmi_id_init error path
        sysfs: sysfs_chmod_file's attr can be const
        firmware: Update hotplug script
        Driver core: move platform device creation helpers to .init.text (if MODULE=n)
        Driver core: reduce duplicated code for platform_device creation
        Driver core: use kmemdup in platform_device_add_resources
        ...
      ab69bcd6
    • Linus Torvalds's avatar
      pci: fix type warnings in intr_remapping.c · c513b67e
      Linus Torvalds authored
      Commit 69309a05 ("x86, asm: Clean up and simplify set_64bit()")
      sanitized the x86-64 types to set_64bit(), and incidentally resulted in
      warnings like
      
       drivers/pci/intr_remapping.c: In function 'modify_irte':
       drivers/pci/intr_remapping.c:314: warning: passing argument 1 of 'set_64bit' from incompatible pointer type
       arch/x86/include/asm/cmpxchg_64.h:6: note:expected 'volatile u64 *' but argument is of type 'long unsigned int *'
      
      It turns out that the change to set_64bit() really does clean up things,
      and the PCI intr_remapping.c file did a rather ugly cast in order to
      avoid warnings with the previous set_64bit() type model.
      
      Removing the ugly cast fixes the warning, and makes everybody happy and
      expects a set_64bit() to take the logical "u64 *" argument.
      Pointed-out-by: default avatarPeter Anvin <hpa@zytor.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c513b67e
    • Linus Torvalds's avatar
      Merge branches 'x86-rwsem-for-linus' and 'x86-gcc46-for-linus' of... · 90c8327c
      Linus Torvalds authored
      Merge branches 'x86-rwsem-for-linus' and 'x86-gcc46-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, rwsem: Minor cleanups
        x86, rwsem: Stay on fast path when count > 0 in __up_write()
      
      * 'x86-gcc46-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, gcc-4.6: Fix set but not read variables
        x86, gcc-4.6: Avoid unused by set variables in rdmsr
      90c8327c
    • Linus Torvalds's avatar
      Merge branch 'x86-setup-for-linus' of... · a417fb99
      Linus Torvalds authored
      Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, setup: move isdigit.h to ctype.h, header files on top.
        x86, setup: enable early console output from the decompressor
        x86, setup: reorganize the early console setup
        x86, setup: Allow global variables and functions in the decompressor
        x86, setup: Only set early_serial_base after port is initialized
        x86, setup: Make the setup code also accept console=uart8250
        x86, setup: Early-boot serial I/O support
      a417fb99
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 9faa1e59
      Linus Torvalds authored
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Ioremap: fix wrong physical address handling in PAT code
        x86, tlb: Clean up and correct used type
        x86, iomap: Fix wrong page aligned size calculation in ioremapping code
        x86, mm: Create symbolic index into address_markers array
        x86, ioremap: Fix normal ram range check
        x86, ioremap: Fix incorrect physical address handling in PAE mode
        x86-64, mm: Initialize VDSO earlier on 64 bits
        x86, kmmio/mmiotrace: Fix double free of kmmio_fault_pages
      9faa1e59
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · d9a73c00
      Linus Torvalds authored
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        um, x86: Cast to (u64 *) inside set_64bit()
        x86-32, asm: Directly access per-cpu GDT
        x86-64, asm: Directly access per-cpu IST
        x86, asm: Merge cmpxchg_486_u64() and cmpxchg8b_emu()
        x86, asm: Move cmpxchg emulation code to arch/x86/lib
        x86, asm: Clean up and simplify <asm/cmpxchg.h>
        x86, asm: Clean up and simplify set_64bit()
        x86: Add memory modify constraints to xchg() and cmpxchg()
        x86-64: Simplify loading initial_gs
        x86: Use symbolic MSR names
        x86: Remove redundant K6 MSRs
      d9a73c00
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of... · b304441c
      Linus Torvalds authored
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, vdso: Don't quote $nm in the script for checking vdso references
        x86, vdso: Error out if the vdso contains external references
      b304441c
    • Linus Torvalds's avatar
      Merge branch 'x86-mrst-for-linus' of... · f7ddc2b6
      Linus Torvalds authored
      Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, mrst: make mrst_timer_options an enum
        x86, mrst: make mrst_identify_cpu() an inline returning enum
        x86, mrst: add more timer config options
        x86, mrst: add cpu type detection
        x86: detect scattered cpuid features earlier
      f7ddc2b6
    • Linus Torvalds's avatar
      Merge branch 'x86-hwmon-for-linus' of... · a5e11599
      Linus Torvalds authored
      Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, hwmon: Package Level Thermal/Power: pkgtemp documentation
        x86, hwmon: Package Level Thermal/Power: power limit
        x86, hwmon: Package Level Thermal/Power: thermal throttling handler
        x86, hwmon: Package Level Thermal/Power: pkgtemp hwmon driver
      a5e11599
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 0f477dd0
      Linus Torvalds authored
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Fix keeping track of AMD C1E
        x86, cpu: Package Level Thermal Control, Power Limit Notification definitions
        x86, cpu: Export AMD errata definitions
        x86, cpu: Use AMD errata checking framework for erratum 383
        x86, cpu: Clean up AMD erratum 400 workaround
        x86, cpu: AMD errata checking framework
        x86, cpu: Split addon_cpuid_features.c
        x86, cpu: Clean up formatting in cpufeature.h, remove override
        x86, cpu: Enumerate xsaveopt
        x86, cpu: Add xsaveopt cpufeature
        x86, cpu: Make init_scattered_cpuid_features() consider cpuid subleaves
        x86, cpu: Support the features flags in new CPUID leaf 7
        x86, cpu: Add CPU flags for F16C and RDRND
        x86: Look for IA32_ENERGY_PERF_BIAS support
        x86, AMD: Extend support to future families
        x86, cacheinfo: Carve out L3 cache slot accessors
        x86, xsave: Cleanup return codes in check_for_xstate()
      0f477dd0
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · c4efd6b5
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
        sched: Use correct macro to display sched_child_runs_first in /proc/sched_debug
        sched: No need for bootmem special cases
        sched: Revert nohz_ratelimit() for now
        sched: Reduce update_group_power() calls
        sched: Update rq->clock for nohz balanced cpus
        sched: Fix spelling of sibling
        sched, cpuset: Drop __cpuexit from cpu hotplug callbacks
        sched: Fix the racy usage of thread_group_cputimer() in fastpath_timer_check()
        sched: run_posix_cpu_timers: Don't check ->exit_state, use lock_task_sighand()
        sched: thread_group_cputime: Simplify, document the "alive" check
        sched: Remove the obsolete exit_state/signal hacks
        sched: task_tick_rt: Remove the obsolete ->signal != NULL check
        sched: __sched_setscheduler: Read the RLIMIT_RTPRIO value lockless
        sched: Fix comments to make them DocBook happy
        sched: Fix fix_small_capacity
        powerpc: Exclude arch_sd_sibiling_asym_packing() on UP
        powerpc: Enable asymmetric SMT scheduling on POWER7
        sched: Add asymmetric group packing option for sibling domain
        sched: Fix capacity calculations for SMT4
        sched: Change nohz idle load balancing logic to push model
        ...
      c4efd6b5
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · 4aed2fd8
      Linus Torvalds authored
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)
        tracing/kprobes: unregister_trace_probe needs to be called under mutex
        perf: expose event__process function
        perf events: Fix mmap offset determination
        perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
        perf, powerpc: Convert the FSL driver to use local64_t
        perf tools: Don't keep unreferenced maps when unmaps are detected
        perf session: Invalidate last_match when removing threads from rb_tree
        perf session: Free the ref_reloc_sym memory at the right place
        x86,mmiotrace: Add support for tracing STOS instruction
        perf, sched migration: Librarize task states and event headers helpers
        perf, sched migration: Librarize the GUI class
        perf, sched migration: Make the GUI class client agnostic
        perf, sched migration: Make it vertically scrollable
        perf, sched migration: Parameterize cpu height and spacing
        perf, sched migration: Fix key bindings
        perf, sched migration: Ignore unhandled task states
        perf, sched migration: Handle ignored migrate out events
        perf: New migration tool overview
        tracing: Drop cpparg() macro
        perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call
        ...
      
      Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c
      4aed2fd8
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · 3a3527b6
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        Revert "net: Make accesses to ->br_port safe for sparse RCU"
        mce: convert to rcu_dereference_index_check()
        net: Make accesses to ->br_port safe for sparse RCU
        vfs: add fs.h to define struct file
        lockdep: Add an in_workqueue_context() lockdep-based test function
        rcu: add __rcu API for later sparse checking
        rcu: add an rcu_dereference_index_check()
        tree/tiny rcu: Add debug RCU head objects
        mm: remove all rcu head initializations
        fs: remove all rcu head initializations, except on_stack initializations
        powerpc: remove all rcu head initializations
      3a3527b6
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · cc77b4db
      Linus Torvalds authored
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86/amd-iommu: Export cache-coherency capability
        iommu-api: Extension to check for interrupt remapping
        x86/amd-iommu: Use for_each_pci_dev()
      cc77b4db
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 132a4edb
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        sata_fsl,mv,nv: prepare for NCQ command completion update
        ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
        libata: more PCI IDs for jmicron controllers
        ata_piix: fix locking around SIDPR access
        [libata] update blacklist for new hyphenated pattern ranges (v2)
        libata: allow hyphenated pattern ranges
        ata_generic: drop hard coded DMA force logic for CENATEK
        [libata] ahci: Fix warning: comparison between 'enum <anonymous>' and 'enum <anonymous>'
        [libata] add ATA_CMD_DSM to ata_get_cmd_descript
        [libata] Add Samsung PATA controller driver, pata_samsung_cf
        [libata] Add 460EX on-chip SATA driver, sata_dwc_460ex
        libata: reduce blacklist size even more (v2)
        libata: reduce blacklist size (v2)
        libata: glob_match for ata_device_blacklist (v2)
        ahci_platform: Remove unneeded ahci_driver.probe assignment
        ahci_platform: Provide for vendor specific init
      132a4edb
    • Alan Stern's avatar
      SCSI: remove fake "address-of" expression · e6da54d8
      Alan Stern authored
      Fake "address-of" expressions that evaluate to NULL generally confuse
      readers and can provoke compiler warnings.  This patch (as1411) removes
      one such fake expression, using an "#ifdef" in its place.
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e6da54d8
    • Sam Ravnborg's avatar
      kconfig: fix make oldconfig · 14828349
      Sam Ravnborg authored
      Linus wrote:
       This seems to make "make oldconfig" a _lot_ more verbose than it
       used to be. In a very annoying way.
      
       I just did a quick git bisect. It's introduced by commit 4062f1a4
       ("kconfig: use long options in conf") by Sam Ravnborg. Apparently that
       thing is totally buggy, and doesn't just change the option names, but
       actively breaks them.
      
      The old behaviour (from years ago) were reintroduced by accident.  Fix
      this so we are back to the version that are silent if there is nothing
      to ask about.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Reviewed-by: default avatarMichal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      14828349
    • David Howells's avatar
      Fix init ordering of /dev/console vs callers of modprobe · 31d1d48e
      David Howells authored
      Make /dev/console get initialised before any initialisation routine that
      invokes modprobe because if modprobe fails, it's going to want to open
      /dev/console, presumably to write an error message to.
      
      The problem with that is that if the /dev/console driver is not yet
      initialised, the chardev handler will call request_module() to invoke
      modprobe, which will fail, because we never compile /dev/console as a
      module.
      
      This will lead to a modprobe loop, showing the following in the kernel
      log:
      
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      
      This can happen, for example, when the built in md5 module can't find
      the built in cryptomgr module (because the latter fails to initialise).
      The md5 module comes before the call to tty_init(), presumably because
      'crypto' comes before 'drivers' alphabetically.
      
      Fix this by calling tty_init() from chrdev_init().
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      31d1d48e
    • David Howells's avatar
      KEYS: request_key() should return -ENOKEY if the constructed key is negative · 1e456a12
      David Howells authored
      request_key() should return -ENOKEY if the key it constructs has been
      negatively instantiated.
      
      Without this, request_key() can return an unusable key to its caller,
      and if the caller then does key_validate() that won't catch the problem.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1e456a12
  3. 05 Aug, 2010 12 commits