1. 07 8月, 2010 11 次提交
    • L
      Merge branch 'x86-hwmon-for-linus' of... · a5e11599
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 0f477dd0
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'sched-core-for-linus' of... · c4efd6b5
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'perf-core-for-linus' of... · 4aed2fd8
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'core-rcu-for-linus' of... · 3a3527b6
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'core-iommu-for-linus' of... · cc77b4db
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 132a4edb
      Linus Torvalds 提交于
      * '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
    • A
      SCSI: remove fake "address-of" expression · e6da54d8
      Alan Stern 提交于
      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: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e6da54d8
    • S
      kconfig: fix make oldconfig · 14828349
      Sam Ravnborg 提交于
      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: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Reviewed-by: NMichal Marek <mmarek@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      14828349
    • D
      Fix init ordering of /dev/console vs callers of modprobe · 31d1d48e
      David Howells 提交于
      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: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      31d1d48e
    • D
      KEYS: request_key() should return -ENOKEY if the constructed key is negative · 1e456a12
      David Howells 提交于
      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: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1e456a12
  2. 06 8月, 2010 20 次提交
  3. 05 8月, 2010 9 次提交