aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-25Merge branch 'sched-fixes-for-linus' of ↵Linus Torvalds5-14/+4
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, doc: Update sched-design-CFS.txt sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group() sched.h: Fix a typo ("its") sched: Fix yield_to kernel-doc
2011-03-25Merge branch 'perf-fixes-for-linus' of ↵Linus Torvalds25-69/+168
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf, x86: Complain louder about BIOSen corrupting CPU/PMU state and continue perf, x86: P4 PMU - Read proper MSR register to catch unflagged overflows perf symbols: Look at .dynsym again if .symtab not found perf build-id: Add quirk to deal with perf.data file format breakage perf session: Pass evsel in event_ops->sample() perf: Better fit max unprivileged mlock pages for tools needs perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx() perf top: Fix uninitialized 'counter' variable tracing: Fix set_ftrace_filter probe function display perf, x86: Fix Intel fixed counters base initialization
2011-03-25Merge branch 'irq-fixes-for-linus' of ↵Linus Torvalds2-26/+33
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: Provide locked setter for chip, handler, name genirq: Provide a lockdep helper genirq; Remove the last leftovers of the old sparse irq code
2011-03-25Merge branch 'core-fixes-for-linus' of ↵Linus Torvalds7-16/+85
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: futex: Fix WARN_ON() test for UP WARN_ON_SMP(): Allow use in if() statements on UP x86, dumpstack: Use %pB format specifier for stack trace vsprintf: Introduce %pB format specifier lockdep: Remove unused 'factor' variable from lockdep_stats_show()
2011-03-25Merge branch 'x86-fixes-for-linus' of ↵Linus Torvalds2-8/+6
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: x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional x86: DT: Fix return condition in irq_create_of_mapping() x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context
2011-03-25Merge branch 'for-linus' of ↵Linus Torvalds170-7131/+6916
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: merge m68k and m68knommu arch directories
2011-03-25Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds1-0/+4
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc32: Fix multiple RTC detections on SUN4D
2011-03-25Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds27-306/+403
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] cmpxchg: implement cmpxchg64() [S390] xchg/cmpxchg: move to own header file [S390] ccwgroup_driver: remove duplicate members [S390] ccw_bus_type: make it static [S390] ccw_driver: remove duplicate members [S390] qdio: prevent handling of buffers if count is zero [S390] setup: register bss section as resource [S390] setup: simplify setup_resources() [S390] wire up sys_syncfs [S390] wire up sys_clock_adjtime [S390] wire up sys_open_by_handle_at [S390] wire up sys_name_to_handle_at [S390] oprofile: disable hw sampling for CONFIG_32BIT [S390] early: limit savesys cmd string handling [S390] early: Fix possible overlapping data buffer
2011-03-25Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds71-1325/+2316
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (49 commits) MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board MIPS: JZ4740: qi_lb60: Add gpio-charger device MIPS: Wire up syncfs(2). MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls. MIPS: VR41xx: Convert to new irq_chip functions MIPS: TXx9: Convert to new irq_chip functions MIPS: SNI: Convert to new irq_chip functions MIPS: Sibyte: Convert to new irq_chip functions MIPS: IP32: Convert to new irq_chip functions MIPS: IP27: Convert to new irq_chip functions MIPS: IP22/IP28: Convert to new irq_chip functions MIPS: RB532: Convert to new irq_chip functions MIPS: PowerTV: Convert to new irq_chip functions MIPS: PNX8550: Convert to new irq_chip functions MIPS: PNX83xx: Convert to new irq_chip functions MIPS: msp71xx: Convert to new irq_chip functions MIPS: Loongson: Convert to new irq_chip functions MIPS: Use generic show_interrupts() MIPS: SMTC: Cleanup the hook mess and use irq_data MIPS: SMTC: Use irq_data in smtc_forward_irq() ...
2011-03-25ipcns: fix use after free in free_ipc_ns()Xiaotian Feng1-1/+1
commit b515498 ("userns: add a user namespace owner of ipc ns") added a user namespace owner of ipc ns, but it also introduced a use after free in free_ipc_ns(). Signed-off-by: Xiaotian Feng <[email protected]> Acked-by: "Serge E. Hallyn" <[email protected]> Acked-by: David Howells <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Daniel Lezcano <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-25codafs: fix build break when CONFIG_PROC_SYSCTL=nRakib Mullick1-0/+9
Commit 0bc825d240ab ("codafs: fix compile warning when CONFIG_SYSCTL=n") introduces build breakage, when CONFIG_PROC_SYSCTL=n and CONFIG_CODA_FS=y: fs/built-in.o: In function `init_coda': psdev.c:(.init.text+0xc02): undefined reference to `coda_sysctl_init' psdev.c:(.init.text+0xc7c): undefined reference to `coda_sysctl_clean' fs/built-in.o: In function `exit_coda': psdev.c:(.exit.text+0xa9): undefined reference to `coda_sysctl_clean' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Rakib Mullick <[email protected]> Reported-by: Ingo Molnar <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-25memstick: add driver for Ricoh R5C592 card readerMaxim Levitsky5-0/+1101
Signed-off-by: Maxim Levitsky <[email protected]> Acked-by: Alex Dubov <[email protected]> Cc: FUJITA Tomonori <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-25kdb: add usage string of 'per_cpu' commandNamhyung Kim1-1/+1
Signed-off-by: Namhyung Kim <[email protected]> Signed-off-by: Jason Wessel <[email protected]>
2011-03-25kgdb,x86_64: fix compile warning found with sparseJason Wessel1-2/+2
Fix sparse warning: arch/x86/kernel/kgdb.c:123:9: warning: switch with no cases Reported-by: Namhyung Kim <[email protected]> Signed-off-by: Jason Wessel <[email protected]>
2011-03-25kdb: code cleanup to use macro instead of valueJovi Zhang1-1/+1
It's better to use macro KDB_BASE_CMD_MAX instead of 50 Signed-off-by: Jovi Zhang <[email protected]> Signed-off-by: Jason Wessel <[email protected]>
2011-03-25kgdboc,kgdbts: strlen() doesn't count the terminatorDan Carpenter2-2/+2
This is an off by one because strlen() doesn't count the null terminator. We strcpy() these strings into an array of size MAX_CONFIG_LEN. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Jason Wessel <[email protected]>
2011-03-25docs: update the development process documentJonathan Corbet7-128/+167
Here's a set of changes updating Documentation/development-process. I have update kernel releases and relevant statistics, added information for a couple of tools, zapped some trailing white space, and generally tried to make it more closely match the current state of affairs. [Typo fixes from Joe Perches and Nicolas Kaiser incorporated] Signed-off-by: Jonathan Corbet <[email protected]> Acked-by: Greg KH <[email protected]> Cc: Randy Dunlap <[email protected]>
2011-03-25ALSA: Fix yet another race in disconnectionTakashi Iwai1-0/+4
This patch fixes a race between snd_card_file_remove() and snd_card_disconnect(). When the card is added to shutdown_files list in snd_card_disconnect(), but it's freed in snd_card_file_remove() at the same time, the shutdown_files list gets corrupted. The list member must be freed in snd_card_file_remove() as well. Reported-and-tested-by: Russ Dill <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-03-25MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 boardLars-Peter Clausen1-4/+4
The jz4740 nand driver now requires that the ecc offsets are set. Signed-off-by: Lars-Peter Clausen <[email protected]> Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2058/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: JZ4740: qi_lb60: Add gpio-charger deviceLars-Peter Clausen1-0/+24
Register the gpio-charger device which reports whether device is currently charging or not. Signed-off-by: Lars-Peter Clausen <[email protected]> Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2059/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: Wire up syncfs(2).Ralf Baechle5-6/+13
Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls.David Daney5-6/+27
These system calls we recently added. 32-bit ABIs need compat handling for sys_clock_adjtime(). o32 also needs compat handling for sys_open_by_handle_at(); Signed-off-by: David Daney <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2165/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: VR41xx: Convert to new irq_chip functionsThomas Gleixner2-47/+44
And cleanup direct access to irq_desc[]. Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2208/ Patchwork: https://patchwork.linux-mips.org/patch/2209/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: TXx9: Convert to new irq_chip functionsThomas Gleixner5-93/+75
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2207/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: SNI: Convert to new irq_chip functionsThomas Gleixner4-74/+33
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2206/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: Sibyte: Convert to new irq_chip functionsThomas Gleixner2-73/+35
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2205/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: IP32: Convert to new irq_chip functionsThomas Gleixner1-92/+42
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2204/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: IP27: Convert to new irq_chip functionsThomas Gleixner2-27/+22
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2203/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: IP22/IP28: Convert to new irq_chip functionsThomas Gleixner1-34/+26
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2202/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: RB532: Convert to new irq_chip functionsThomas Gleixner1-16/+16
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2201/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: PowerTV: Convert to new irq_chip functionsThomas Gleixner1-7/+6
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2200/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: PNX8550: Convert to new irq_chip functionsThomas Gleixner1-9/+9
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2199/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: PNX83xx: Convert to new irq_chip functionsThomas Gleixner1-82/+16
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2198/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: msp71xx: Convert to new irq_chip functionsThomas Gleixner3-93/+46
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2197/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: Loongson: Convert to new irq_chip functionsThomas Gleixner1-9/+7
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2196/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: Use generic show_interrupts()Thomas Gleixner2-41/+3
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2195/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: SMTC: Cleanup the hook mess and use irq_dataThomas Gleixner3-39/+39
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2194/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: SMTC: Use irq_data in smtc_forward_irq()Thomas Gleixner1-1/+2
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2193/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: TXx9: Convert core to new irq_chip functionsThomas Gleixner1-14/+14
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2192/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: irq_cpu: Convert to new irq_chip functionsThomas Gleixner1-25/+21
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2191/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: RM9000: Convert to new irq_chip functionsThomas Gleixner1-26/+23
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2190/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: rm7000: Convert to new irq_chip functionsThomas Gleixner1-9/+9
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2189/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: MSC01: Convert to new irq_chip functionsThomas Gleixner1-27/+24
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2188/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: GT641xx: Convert to new irq_chip functionsThomas Gleixner1-13/+13
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2187/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: GIC: Convert to new irq_chip functionsThomas Gleixner1-25/+18
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2186/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: i8259: Convert to new irq_chip functionsThomas Gleixner3-26/+24
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2185/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: LASAt: Convert to new irq_chip functionsThomas Gleixner1-8/+8
Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2184/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: JZ4740: Cleanup the mechanical irq_chip conversion Lars-Peter Clausen1-15/+2
The conversion did not make use of the new chip flag which signals the core code to mask the chip before calling the set_type callback. Sigh. Use the new lockdep helper as well. Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2183/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: JZ4740: GPIO: Use shared irq chip for all gpiosLars-Peter Clausen1-12/+13
Currently there is one irq_chip per gpio_chip with the only difference being the name. Since the information whether the irq belong to GPIO bank A, B, C or D is not that important rewrite the code to simply use a single irq_chip for all gpio_chips. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2182/ Signed-off-by: Ralf Baechle <[email protected]>
2011-03-25MIPS: JZ4740: Convert to new irq functionsThomas Gleixner2-58/+67
Convert the JZ4740 intc and gpio irq chips to use newstyle irq functions. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2181/ Signed-off-by: Ralf Baechle <[email protected]>