summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2009-07-06rr/pmac: fix for cpumask accessor changesStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-07-06Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/cpu/perf_counter.c
2009-07-06Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/include/asm/termios.h include/linux/rcupdate.h
2009-07-06Merge commit 'suspend/linux-next'Stephen Rothwell
Conflicts: arch/microblaze/include/asm/device.h
2009-07-06Merge commit 'trivial/for-next'Stephen Rothwell
2009-07-06Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-07-06Merge commit 'refs/next/20090703/ttydev'Stephen Rothwell
Conflicts: drivers/char/tty_ldisc.c
2009-07-06Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-07-06Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/mips/kernel/smp-cmp.c arch/powerpc/platforms/powermac/setup.c
2009-07-06Merge commit 'crypto/master'Stephen Rothwell
2009-07-06Merge commit 'kvm/master'Stephen Rothwell
2009-07-06Merge commit 'acpi/test'Stephen Rothwell
2009-07-06Merge commit 'pci/linux-next'Stephen Rothwell
2009-07-06Merge commit 'sh/master'Stephen Rothwell
2009-07-06Merge commit 's390/features'Stephen Rothwell
2009-07-06Merge commit 'mips/mips-for-linux-next'Stephen Rothwell
Conflicts: arch/mips/cavium-octeon/dma-octeon.c arch/mips/cavium-octeon/executive/cvmx-helper-errata.c arch/mips/mm/tlbex.c arch/mips/sibyte/swarm/setup.c drivers/char/hw_random/Kconfig drivers/char/hw_random/Makefile drivers/dma/txx9dmac.c
2009-07-06Merge commit 'microblaze/next'Stephen Rothwell
2009-07-06Merge commit 'm68knommu/for-next'Stephen Rothwell
2009-07-06Merge commit 'cris/for-next'Stephen Rothwell
2009-07-06Merge commit 'arm/devel'Stephen Rothwell
2009-07-06Merge branch 'quilt/driver-core.current'Stephen Rothwell
2009-07-06Merge commit 'pci-current/for-linus'Stephen Rothwell
2009-07-06Merge commit 'arm-current/master'Stephen Rothwell
2009-07-06sparc: remove driver-core BUS_ID_SIZEKay Sievers
The name size limit is gone from the driver-core, the BUS_ID_SIZE value will be removed. Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-05Merge branch 'arm' into develRussell King
2009-07-05[ARM] versatile: add PL061 gpiolib supportRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-07-05[ARM] realview: add PL061 gpiolib supportRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-07-05KVM: x2apic interface to lapicGleb Natapov
This patch implements MSR interface to local apic as defines by x2apic Intel specification. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
2009-07-05KVM: Add Directed EOI support to APIC emulationGleb Natapov
Directed EOI is specified by x2APIC, but is available even when lapic is in xAPIC mode. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
2009-07-05[ARM] pgtable: file pte layout documentationRussell King
Document the layout of our file PTE entries. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-07-05[ARM] pgtable: swp pte layout documentation, definitions, and checkRussell King
Document the layout of our swp PTE entries, adding definitions for the bit masks/shifts/sizes, and implement MAX_SWAPFILES_CHECK() such that we fail to build if we are unable to properly encode the swp type field. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-07-05[ARM] export __cpu_flush_dcache_pageRussell King
Now required for libsas: Kernel: arch/arm/boot/Image is ready Kernel: arch/arm/boot/zImage is ready Building modules, stage 2. MODPOST 1096 modules ERROR: "xscale_flush_kern_dcache_page" [drivers/scsi/libsas/libsas.ko] undefined! Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-07-05Merge branch 'irq/core' into auto-latestIngo Molnar
2009-07-05Merge branch 'x86/urgent' into auto-latestIngo Molnar
2009-07-05Merge branch 'master' of ↵Avi Kivity
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Signed-off-by: Avi Kivity <avi@redhat.com>
2009-07-05arm: rework omap suspend_late()/resume_early()Magnus Damm
This patch reworks platform driver power management code for omap drivers using late/early legacy callbacks. The callbacks are converted for CONFIG_SUSPEND like this: suspend_late() -> suspend_noirq() resume_early() -> resume_noirq() Signed-off-by: Magnus Damm <damm@igel.co.jp> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2009-07-05Driver Core: Add platform device arch data V3Magnus Damm
Allow architecture specific data in struct platform_device V3. With this patch struct pdev_archdata is added to struct platform_device, similar to struct dev_archdata in found in struct device. Useful for architecture code that needs to keep extra data associated with each platform device. Struct pdev_archdata is different from dev.platform_data, the convention is that dev.platform_data points to driver-specific data. It may or may not be required by the driver. The format of this depends on driver but is the same across architectures. The structure pdev_archdata is a place for architecture specific data. This data is handled by architecture specific code (for example runtime PM), and since it is architecture specific it should _never_ be touched by device driver code. Exactly like struct dev_archdata but for platform devices. [rjw: This change is for power management mostly and that's why it goes through the suspend tree.] Signed-off-by: Magnus Damm <damm@igel.co.jp> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2009-07-04x86: fix usage of bios intcall()Akinobu Mita
Some intcall() misuses the input biosregs as output in cf06de7b9cdd3efee7a59dced1977b3c21d43732 This fixes the problem vga=ask boot option doesn't show enough modes. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> LKML-Reference: <20090701021307.GA3127@localhost.localdomain> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-07-04Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (27 commits) parisc: use generic atomic64 on 32-bit parisc: superio: fix build breakage parisc: Fix PCI resource allocation on non-PAT SBA machines parisc: perf: wire up sys_perf_counter_open parisc: add task_pt_regs macro parisc: wire sys_perf_counter_open to sys_ni_syscall parisc: inventory.c, fix bloated stack frame parisc: processor.c, fix bloated stack frame parisc: fix compile warning in mm/init.c parisc: remove dead code from sys_parisc32.c parisc: wire up rt_tgsigqueueinfo parisc: ensure broadcast tlb purge runs single threaded parisc: fix "delay!" timer handling parisc: fix mismatched parenthesis in memcpy.c parisc: Fix gcc 4.4 warning in lba_pci.c parisc: add parameter to read_cr16() parisc: decode_exc.c should include kernel.h parisc: remove obsolete hw_interrupt_type parisc: fix irq compile bugs in arch/parisc/kernel/irq.c parisc: advertise PCI devs after "assign_resources" ... Manually fixed up trivial conflicts in tools/perf/perf.h due to addition of SH vs HPPA perf-counter support.
2009-07-04Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: Fix CONFIG_FLATMEM version of pfn_valid() MIPS: Reorganize Cavium OCTEON PCI support. Update Yoichi Yuasa's e-mail address MIPS: Allow suspend and hibernation again on uniprocessor kernels. MIPS: 64-bit: Fix o32 core dump MIPS: BC47xx: Fix SSB irq setup MIPS: CMP: Update sync-r4k for current kernel MIPS: CMP: Move gcmp_probe to before the SMP ops MIPS: CMP: activate CMP support MIPS: CMP: Extend IPI handling to CPU number MIPS: CMP: Extend the GIC IPI interrupts beyond 32 MIPS: Define __arch_swab64 for all mips r2 cpus MIPS: Update VR41xx GPIO driver to use gpiolib MIPS: Hookup new syscalls sys_rt_tgsigqueueinfo and sys_perf_counter_open. MIPS: Malta: Remove unnecessary function prototypes MIPS: MT: Remove unnecessary semicolons MIPS: Add support for Texas Instruments AR7 System-on-a-Chip
2009-07-04Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixesLinus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: kbuild: finally remove the obsolete variable $TOPDIR gitignore: ignore scripts/ihex2fw Kbuild: Disable the -Wformat-security gcc flag gitignore: ignore gcov output files kbuild: deb-pkg ship changelog Add new __init_task_data macro to be used in arch init_task.c files. asm-generic/vmlinux.lds.h: shuffle INIT_TASK* macro names in vmlinux.lds.h Add new macros for page-aligned data and bss sections. asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition.
2009-07-05Merge branches 'sh/hwblk', 'sh/cpuidle' and 'sh/stable-updates'Paul Mundt
2009-07-05sh: Use bootmem ontop of lmb for NUMAMatt Fleming
Like the UP case, use lmb as the foundation of memory resource management on NUMA. Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-07-05sh: cpuidle for SuperH Mobile using hwblkMagnus Damm
This patch adds cpuidle support for SuperH Mobile. The sleep mode selected by cpuidle is compared with the mode selected by the hwblk sleep code and the best allowed mode is entered. At this point "Sleep mode" and "Sleep mode + SF" are supported. This code can easily be extended to support "Software suspend mode", but the assembly code must first be updated to avoid loosing interrupts. Also, update the code to only copy the assembly snippet into internal memory once at bootup. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-07-05sh: hwblk for sh7722Magnus Damm
This patch contains the sh7722 specific hwblk implementation. Hwblk ids are added to the processor specific header file, module stop bits and areas are kept track of as hwblks, clocks are converted to make use of the shared hwblk code. Code to determine allowed sleep modes is also added. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-07-05sh: hwblk base implementationMagnus Damm
This patch is the hwblk base implementation, containing structures and shared functions dealing with hardware blocks. A each processor model should provide a list of hwblks and describe which module stop bit that is associated with each hwblck and how the hwblks are grouped together into areas. The shared code keeps track of the usage count for each hwblk and the areas. Fallback implementations for processor specific code are also kept as weak symbols. The clock framework, the runtime pm code and cpuidle will all tie into this hwblk implementation. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-07-05sh: add r8a66597 usb0 host to the se7724 boardMagnus Damm
Add USB host support for port CN27 on the Solution Engine 7724 board. The r8a66597-hcd driver is hooked up as a platform device and some registers are configured to enable the USB host function. The hardware driving the USB port is the on-chip USB0 block in the sh7724 processor configured as USB host controller. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-07-04Merge branch 'auto-perfcounters-next' into auto-latestIngo Molnar
2009-07-04Merge branch 'auto-oprofile-next' into auto-latestIngo Molnar
2009-07-04Merge branch 'auto-safe-poison-pointers-next' into auto-latestIngo Molnar