summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2009-08-27Merge branch 'quilt/usb'Stephen Rothwell
2009-08-27Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: arch/x86/include/asm/termios.h
2009-08-27Merge commit 'hwpoison/hwpoison'Stephen Rothwell
2009-08-27Merge commit 'sfi/sfi-test'Stephen Rothwell
Conflicts: arch/x86/include/asm/io_apic.h arch/x86/kernel/acpi/boot.c arch/x86/kernel/apic/io_apic.c drivers/acpi/internal.h drivers/acpi/tables.c include/linux/acpi.h
2009-08-27Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/sh/kernel/vmlinux.lds.S
2009-08-27Merge commit 'edac-amd/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/smpboot.c include/linux/topology.h
2009-08-27Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/include/asm/socket.h include/linux/rcupdate.h kernel/fork.c
2009-08-27Merge commit 'kmemleak/kmemleak'Stephen Rothwell
2009-08-27Merge commit 'omap/for-next'Stephen Rothwell
2009-08-27Merge commit 'trivial/for-next'Stephen Rothwell
2009-08-27Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-08-27Merge commit 'agp/agp-next'Stephen Rothwell
Conflicts: drivers/char/agp/uninorth-agp.c
2009-08-27Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-08-27Merge commit 'input/next'Stephen Rothwell
Conflicts: drivers/base/platform.c
2009-08-27Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: include/linux/cpumask.h
2009-08-27Merge commit 'sound/for-next'Stephen Rothwell
2009-08-27Merge commit 'crypto/master'Stephen Rothwell
2009-08-27Merge commit 'net/master'Stephen Rothwell
2009-08-27Merge commit 'kvm/master'Stephen Rothwell
2009-08-27Merge commit 'acpi/test'Stephen Rothwell
2009-08-27Merge commit 'v4l-dvb/master'Stephen Rothwell
Conflicts: arch/arm/mach-davinci/board-dm646x-evm.c arch/arm/mach-davinci/dm355.c arch/arm/mach-davinci/dm644x.c arch/arm/mach-davinci/dm646x.c arch/arm/mach-davinci/include/mach/dm355.h arch/arm/mach-davinci/include/mach/dm644x.h
2009-08-27Merge commit 'pci/linux-next'Stephen Rothwell
2009-08-27Merge commit 'ocfs2/linux-next'Stephen Rothwell
2009-08-27Merge commit 'sparc/master'Stephen Rothwell
2009-08-27Merge commit 'sh/master'Stephen Rothwell
2009-08-27Merge commit 's390/features'Stephen Rothwell
2009-08-27Merge commit 'galak/next'Stephen Rothwell
2009-08-27Merge commit '4xx/next'Stephen Rothwell
2009-08-27Merge commit 'powerpc/next'Stephen Rothwell
2009-08-27Merge commit 'parisc/next'Stephen Rothwell
2009-08-27Merge commit 'm68knommu/for-next'Stephen Rothwell
2009-08-27Merge commit 'ia64/test'Stephen Rothwell
2009-08-27Merge commit 'cris/for-next'Stephen Rothwell
2009-08-27Merge commit 'avr32/avr32-arch'Stephen Rothwell
2009-08-27Merge commit 'pxa/for-next'Stephen Rothwell
Conflicts: MAINTAINERS
2009-08-27Merge commit 'davinci/for-next'Stephen Rothwell
2009-08-27Merge commit 'arm/devel'Stephen Rothwell
2009-08-27early_printk: Allow more than one early consoleJason Wessel
It is desirable to be able to use one early boot device to debug another or to have multiple places you can see the early boot diagnostics, such as the vga screen or serial device. This patch changes the early_printk console device registration to allow more than one early printk device to get registered via register_console(). Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-08-27USB: ehci,dbgp,early_printk: split ehci debug driver from early_printk.cJason Wessel
Move the dbgp early printk driver in advance of refactoring and adding new code, so the changes to this code are tracked separately from the move of the code. The drivers/usb/early directory will be the location of the current and future early usb code for driving usb devices prior initializing the standard interrupt driven USB drivers. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-08-27serial: kill off uart_infoAlan Cox
We moved this into uart_state, now move the fields out of the separate structure and kill it off. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-08-27x86: asm/termios.h remove irrelevant comment for userspaceJaswinder Singh Rajput
following comment is irrelevant at usr/include/asm/termios.h : /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ Also fixed some alignment and space issues. Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-08-27OMAP1: AMS_DELTA: add modem supportJanusz Krzysztofik
This patch adds support for modem device found on Amstrad E3 (Delta) board. Based on earlier patch by Jonathan McDowell, available at http://the.earth.li/pub/e3/2.6.19/ams-delta-modem.patch. Modified after Ladislav Michl's arch/arm/mach-omap1/board-voiceblue.c. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-08-26m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_openGeert Uytterhoeven
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer <gerg@uclinux.org>
2009-08-26m68k: Fix redefinition of pgprot_noncachedAlexey Dobriyan
arch/m68k/include/asm/pgtable_mm.h:148:1: warning: "pgprot_noncached" redefined In file included from arch/m68k/include/asm/pgtable_mm.h:138, from arch/m68k/include/asm/pgtable.h:4, from include/linux/mm.h:40, from include/linux/pagemap.h:7, from include/linux/blkdev.h:12, from arch/m68k/emu/nfblock.c:17: include/asm-generic/pgtable.h:133:1: warning: this is the location of the previous definition pgprot_noncached() should be defined _before_ including asm-generic/pgtable.h Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-08-26arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap argAndrew Morton
arch/m68k/include/asm/motorola_pgalloc.h: In function 'pte_alloc_one': arch/m68k/include/asm/motorola_pgalloc.h:44: warning: passing argument 1 of 'kunmap' from incompatible pointer type Also, remove unneeded test for kmap() failure. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-08-26m68k: cnt reaches -1, not 0Roel Kluin
With the postfix decrement cnt reaches -1 rather than 0. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-08-26HWPOISON: x86: Add VM_FAULT_HWPOISON handling to x86 page fault handler v2Andi Kleen
Add VM_FAULT_HWPOISON handling to the x86 page fault handler. This is very similar to VM_FAULT_OOM, the only difference is that a different si_code is passed to user space and the new addr_lsb field is initialized. v2: Make the printk more verbose/unique Signed-off-by: Andi Kleen <ak@linux.intel.com>
2009-08-26Revert "KVM: x86 emulator: Report unhandled instructions"Avi Kivity
This reverts commit ea67fbbcf346a15b1e8e18cff7c64c248972b961. Unhandled instructions can and do occur in normal runs. This needs to be made optional so as not to spam the logs. Signed-off-by: Avi Kivity <avi@redhat.com>
2009-08-26KVM: Move assigned device code to own fileAvi Kivity
Signed-off-by: Avi Kivity <avi@redhat.com>
2009-08-26KVM: Return -ENOTTY on unrecognized ioctlsAvi Kivity
Not the incorrect -EINVAL. Signed-off-by: Avi Kivity <avi@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 15:11:36 +0000