1. 23 6月, 2009 7 次提交
  2. 22 6月, 2009 16 次提交
  3. 21 6月, 2009 17 次提交
    • T
      Merge branch 'topic/hda' into for-linus · 47166281
      Takashi Iwai 提交于
      * topic/hda:
        ALSA: hda - Add model=6530g option
        ALSA: hda - Acer Inspire 6530G model for Realtek ALC888
        ALSA: HDA - Correct trivial typos in comments.
        ALSA: HDA - Name-fixes in code (tagra/targa)
        ALSA: HDA - Add pci-quirk for MSI MS-7350 motherboard.
        ALSA: hda - Fix memory leak at codec creation
      47166281
    • T
      Merge branch 'topic/caiaq' into for-linus · 0b6306f6
      Takashi Iwai 提交于
      * topic/caiaq:
        ALSA: snd_usb_caiaq: fix legacy input streaming
      0b6306f6
    • T
      Merge branch 'topic/asoc' into for-linus · 9fd0d96e
      Takashi Iwai 提交于
      * topic/asoc:
        ASoC: Kill BUS_ID_SIZE
      9fd0d96e
    • T
      ALSA: hda - Add model=6530g option · b1a91469
      Takashi Iwai 提交于
      Add the new model string corresponding to the previous Acer Aspire
      6530G support.
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      b1a91469
    • T
      ALSA: hda - Acer Inspire 6530G model for Realtek ALC888 · d2fd4b09
      Tony Vroon 提交于
      The selected 4930G model seemed to keep the subwoofer 'tuba'
      function from operating correctly. Removing the existing PCI
      ID match made this work again, but it was mapped to 'Side'
      instead of to LFE as one would expect.
      This attempts to enable all functionality and keep the amount
      of available mixer sliders low. Any slider that had no audible
      effect on the output audio has been removed, and as such EAPD
      is not currently enabled.
      Signed-off-by: NTony Vroon <tony@linx.net>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      d2fd4b09
    • P
      lockdep: Select frame pointers on x86 · 00540e5d
      Peter Zijlstra 提交于
      x86 stack traces are a piece of crap without frame pointers, and its not
      like the 'performance gain' of not having stack pointers matters when you
      selected lockdep.
      Reported-by: NAndrew Morton <akpm@linux-foundation.org>
      LKML-Reference: <new-submission>
      Cc: <stable@kernel.org>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      00540e5d
    • J
      mm: page_alloc: clear PG_locked before checking flags on free · c277331d
      Johannes Weiner 提交于
      da456f14 "page allocator: do not disable interrupts in free_page_mlock()" moved
      the PG_mlocked clearing after the flag sanity checking which makes mlocked
      pages always trigger 'bad page'.  Fix this by clearing the bit up front.
      Reported--and-debugged-by: NPeter Chubb <peter.chubb@nicta.com.au>
      Signed-off-by: NJohannes Weiner <hannes@cmpxchg.org>
      Acked-by: NMel Gorman <mel@csn.ul.ie>
      Tested-by: NMaxim Levitsky <maximlevitsky@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c277331d
    • L
      x86, 64-bit: Clean up user address masking · 9063c61f
      Linus Torvalds 提交于
      The discussion about using "access_ok()" in get_user_pages_fast() (see
      commit 7f818906: "x86: don't use
      'access_ok()' as a range check in get_user_pages_fast()" for details and
      end result), made us notice that x86-64 was really being very sloppy
      about virtual address checking.
      
      So be way more careful and straightforward about masking x86-64 virtual
      addresses:
      
       - All the VIRTUAL_MASK* variants now cover half of the address
         space, it's not like we can use the full mask on a signed
         integer, and the larger mask just invites mistakes when
         applying it to either half of the 48-bit address space.
      
       - /proc/kcore's kc_offset_to_vaddr() becomes a lot more
         obvious when it transforms a file offset into a
         (kernel-half) virtual address.
      
       - Unify/simplify the 32-bit and 64-bit USER_DS definition to
         be based on TASK_SIZE_MAX.
      
      This cleanup and more careful/obvious user virtual address checking also
      uncovered a buglet in the x86-64 implementation of strnlen_user(): it
      would do an "access_ok()" check on the whole potential area, even if the
      string itself was much shorter, and thus return an error even for valid
      strings. Our sloppy checking had hidden this.
      
      So this fixes 'strnlen_user()' to do this properly, the same way we
      already handled user strings in 'strncpy_from_user()'.  Namely by just
      checking the first byte, and then relying on fault handling for the
      rest.  That always works, since we impose a guard page that cannot be
      mapped at the end of the user space address space (and even if we
      didn't, we'd have the address space hole).
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Nick Piggin <npiggin@suse.de>
      Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9063c61f
    • L
      Merge branch 'irq-fixes-for-linus' of... · 2453d6ff
      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, irq.h: Fix kernel-doc warnings
        genirq: fix comment to say IRQ_WAKE_THREAD
      2453d6ff
    • L
      Merge branch 'perfcounters-fixes-for-linus' of... · 12e24f34
      Linus Torvalds 提交于
      Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (49 commits)
        perfcounter: Handle some IO return values
        perf_counter: Push perf_sample_data through the swcounter code
        perf_counter tools: Define and use our own u64, s64 etc. definitions
        perf_counter: Close race in perf_lock_task_context()
        perf_counter, x86: Improve interactions with fast-gup
        perf_counter: Simplify and fix task migration counting
        perf_counter tools: Add a data file header
        perf_counter: Update userspace callchain sampling uses
        perf_counter: Make callchain samples extensible
        perf report: Filter to parent set by default
        perf_counter tools: Handle lost events
        perf_counter: Add event overlow handling
        fs: Provide empty .set_page_dirty() aop for anon inodes
        perf_counter: tools: Makefile tweaks for 64-bit powerpc
        perf_counter: powerpc: Add processor back-end for MPC7450 family
        perf_counter: powerpc: Make powerpc perf_counter code safe for 32-bit kernels
        perf_counter: powerpc: Change how processor-specific back-ends get selected
        perf_counter: powerpc: Use unsigned long for register and constraint values
        perf_counter: powerpc: Enable use of software counters on 32-bit powerpc
        perf_counter tools: Add and use isprint()
        ...
      12e24f34
    • L
      Merge branch 'sched-fixes-for-linus' of... · 1eb51c33
      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: Fix out of scope variable access in sched_slice()
        sched: Hide runqueues from direct refer at source code level
        sched: Remove unneeded __ref tag
        sched, x86: Fix cpufreq + sched_clock() TSC scaling
      1eb51c33
    • L
      Merge branch 'tracing-fixes-for-linus' of... · b0b7065b
      Linus Torvalds 提交于
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
        tracing/urgent: warn in case of ftrace_start_up inbalance
        tracing/urgent: fix unbalanced ftrace_start_up
        function-graph: add stack frame test
        function-graph: disable when both x86_32 and optimize for size are configured
        ring-buffer: have benchmark test print to trace buffer
        ring-buffer: do not grab locks in nmi
        ring-buffer: add locks around rb_per_cpu_empty
        ring-buffer: check for less than two in size allocation
        ring-buffer: remove useless compile check for buffer_page size
        ring-buffer: remove useless warn on check
        ring-buffer: use BUF_PAGE_HDR_SIZE in calculating index
        tracing: update sample event documentation
        tracing/filters: fix race between filter setting and module unload
        tracing/filters: free filter_string in destroy_preds()
        ring-buffer: use commit counters for commit pointer accounting
        ring-buffer: remove unused variable
        ring-buffer: have benchmark test handle discarded events
        ring-buffer: prevent adding write in discarded area
        tracing/filters: strloc should be unsigned short
        tracing/filters: operand can be negative
        ...
      
      Fix up kmemcheck-induced conflict in kernel/trace/ring_buffer.c manually
      b0b7065b
    • L
      Merge branch 'timers-fixes-for-linus' of... · 38df92b8
      Linus Torvalds 提交于
      Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        NOHZ: Properly feed cpufreq ondemand governor
      38df92b8
    • L
      Merge branch 'x86-fixes-for-linus' of... · c4c5ab30
      Linus Torvalds 提交于
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (45 commits)
        x86, mce: fix error path in mce_create_device()
        x86: use zalloc_cpumask_var for mce_dev_initialized
        x86: fix duplicated sysfs attribute
        x86: de-assembler-ize asm/desc.h
        i386: fix/simplify espfix stack switching, move it into assembly
        i386: fix return to 16-bit stack from NMI handler
        x86, ioapic: Don't call disconnect_bsp_APIC if no APIC present
        x86: Remove duplicated #include's
        x86: msr.h linux/types.h is only required for __KERNEL__
        x86: nmi: Add Intel processor 0x6f4 to NMI perfctr1 workaround
        x86, mce: mce_intel.c needs <asm/apic.h>
        x86: apic/io_apic.c: dmar_msi_type should be static
        x86, io_apic.c: Work around compiler warning
        x86: mce: Don't touch THERMAL_APIC_VECTOR if no active APIC present
        x86: mce: Handle banks == 0 case in K7 quirk
        x86, boot: use .code16gcc instead of .code16
        x86: correct the conversion of EFI memory types
        x86: cap iomem_resource to addressable physical memory
        x86, mce: rename _64.c files which are no longer 64-bit-specific
        x86, mce: mce.h cleanup
        ...
      
      Manually fix up trivial conflict in arch/x86/mm/fault.c
      c4c5ab30
    • L
      Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 7fd5b632
      Linus Torvalds 提交于
      * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Add missing symbols for CONSTRUCTORS support
        microblaze: remove init_mm
      7fd5b632
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · ad5cf46b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
        kernel-doc: fix param matching for array params
        kernel-doc: ignore kmemcheck_bitfield_begin/end
        kallsyms: fix inverted valid symbol checking
        kbuild: fix build error during make htmldocs
      ad5cf46b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 93db6294
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits)
        Input: add driver for Synaptics I2C touchpad
        Input: synaptics - add support for reporting x/y resolution
        Input: ALPS - handle touchpoints buttons correctly
        Input: gpio-keys - change timer to workqueue
        Input: ads7846 - pin change interrupt support
        Input: add support for touchscreen on W90P910 ARM platform
        Input: appletouch - improve finger detection
        Input: wacom - clear Intuos4 wheel data when finger leaves proximity
        Input: ucb1400 - move static function from header into core
        Input: add driver for EETI touchpanels
        Input: ads7846 - more detailed model name in sysfs
        Input: ads7846 - support swapping x and y axes
        Input: ati_remote2 - use non-atomic bitops
        Input: introduce lm8323 keypad driver
        Input: psmouse - ESD workaround fix for OLPC XO touchpad
        Input: tsc2007 - make sure platform provides get_pendown_state()
        Input: uinput - flush all pending ff effects before destroying device
        Input: simplify name handling for certain input handles
        Input: serio - do not use deprecated dev.power.power_state
        Input: wacom - add support for Intuos4 tablets
        ...
      93db6294