p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
263,259 Commits 2 Branches 0 Tags 3.6 GiB
Commit Graph

263259 Commits

Author SHA1 Message Date
Nicolas Pitre 57c89707da musb_debugfs.c: remove unneeded includes on ARM 
Nothing actually requires that <mach/hardware.h>, <mach/memory.h> nor
<asm/mach-types.h> be included here.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Felipe Balbi <balbi@ti.com>
 2011-09-26 10:08:31 -04:00
Nicolas Pitre 98b0124f0e ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 
Original comment:

  Restrict DMA-able region to workaround silicon limitation.
  The limitation restricts buffers available for DMA to SD/MMC
  hardware to be below 256MB.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
 2011-09-06 17:25:54 -04:00
Nicolas Pitre 96f90c7915 Merge the enabling by default of ARM_PATCH_PHYS_VIRT 
Conflicts:
	arch/arm/mach-msm/board-msm7x30.c
 2011-08-29 15:29:00 -04:00
Russell King ad30a2bbdc Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable 2011-08-23 10:54:51 +01:00
Russell King 0cd21ebcc5 Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable 2011-08-23 10:54:45 +01:00
Linus Torvalds fcb8ce5cfe Linux 3.1-rc3 2011-08-22 11:42:53 -07:00
Linus Torvalds 8f6544edb2 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Add group event scheduling option to perf record/stat
  MAINTAINERS: Fix list of perf events source files
  perf tools: Fix build against newer glibc
  perf tools: Fix error handling of unknown events
  perf evlist: Fix missing event name init for default event
  perf list: Fix exit value
 2011-08-22 11:26:56 -07:00
Linus Torvalds 4762e252f4 Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/tracing: Fix tracing config option properly
  xen: Do not enable PV IPIs when vector callback not present
  xen/x86: replace order-based range checking of M2P table by linear one
  xen: xen-selfballoon.c needs more header files
 2011-08-22 11:25:44 -07:00
Jeremy Fitzhardinge 60c5f08e15 xen/tracing: Fix tracing config option properly 
Steven Rostedt says we should use CONFIG_EVENT_TRACING.

Cc:Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 2011-08-22 11:28:33 -04:00
Stefano Stabellini 3c05c4bed4 xen: Do not enable PV IPIs when vector callback not present 
Fix regression for HVM case on older (<4.1.1) hypervisors caused by

  commit 99bbb3a84a
  Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
  Date:   Thu Dec 2 17:55:10 2010 +0000

    xen: PV on HVM: support PV spinlocks and IPIs

This change replaced the SMP operations with event based handlers without
taking into account that this only works when the hypervisor supports
callback vectors. This causes unexplainable hangs early on boot for
HVM guests with more than one CPU.

BugLink: http://bugs.launchpad.net/bugs/791850

CC: stable@kernel.org
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Tested-and-Reported-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 2011-08-22 11:28:09 -04:00
Jon Medhurst 97fef8bda9 ARM: Remove support for macro CONSISTENT_DMA_SIZE 
There are now no platforms which set this macro.

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
 2011-08-22 12:00:12 +00:00
Jon Medhurst 9b74202402 ARM: mach-shmobile: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Paul Mundt <lethal@linux-sh.org>
CC: Magnus Damm <magnus.damm@gmail.com>
 2011-08-22 12:00:12 +00:00
Jon Medhurst 2d5e975b21 ARM: mach-bcmring: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Jiandong Zheng <jdzheng@broadcom.com>
CC: Scott Branden <sbranden@broadcom.com>
 2011-08-22 12:00:12 +00:00
Jon Medhurst f407c2e38e ARM: mach-at91: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Ferre<nicolas.ferre@atmel.com>
 2011-08-22 12:00:11 +00:00
Jon Medhurst d70a5969e9 ARM: mach-u300: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
 2011-08-22 12:00:11 +00:00
Jon Medhurst fd24f90318 ARM: mach-davinci: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>
 2011-08-22 12:00:11 +00:00
Jon Medhurst 389d12cc7f ARM: mxc: Remove setting of consistent dma size 
All in-tree MX boards using video use memblock_* functions to get their
coherent dma space for the camera. So there is no need to increase
CONSISTENT_DMA_SIZE beyond the default 2MB and we can simply remove the
defines which do this.

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
 2011-08-22 12:00:11 +00:00
Jon Medhurst a06a58abec ARM: mach-s5pv210: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Kukjin Kim <kgene.kim@samsung.com>
 2011-08-22 12:00:11 +00:00
Jon Medhurst d9c295ad35 ARM: mach-s5p64x0: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Kukjin Kim <kgene.kim@samsung.com>
 2011-08-22 12:00:10 +00:00
Jon Medhurst 284dc06008 ARM: mach-s3c64xx: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Ben Dooks <ben-linux@fluff.org>
 2011-08-22 12:00:10 +00:00
Jon Medhurst 009426a0eb ARM: omap: Setup consistent dma size at boot time 
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Tony Lindgren <tony@atomide.com>
 2011-08-22 12:00:10 +00:00
Jon Medhurst 99d1717dd7 ARM: Add init_consistent_dma_size() 
This function can be called during boot to increase the size of the consistent
DMA region above it's default value of 2MB. It must be called before the memory
allocator is initialised, i.e. before any core_initcall.

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
 2011-08-22 12:00:10 +00:00
Linus Torvalds 3210d190dc Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: core: handle ack_busy when fetching the Config ROM
 2011-08-21 18:13:19 -07:00
Nicolas Pitre af6871683e ARM: remove boot_params from struct machine_desc 
Now that there is no more users, we can remove it from the kernel.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:24 -04:00
Nicolas Pitre 0cc9311fad ARM: mach-prima2: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:23 -04:00
Nicolas Pitre b84047e514 ARM: mach-w90x900: remove useless boot_params entries 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:22 -04:00
Nicolas Pitre 59a0e0c5df ARM: mach-vt8500: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:21 -04:00
Nicolas Pitre e9ce8e5bd0 ARM: vexpress: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:20 -04:00
Nicolas Pitre 171fa8a7bb ARM: mach-versatile: convert boot-params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:19 -04:00
Nicolas Pitre bc77b1aa0c ARM: mach-ux500: convert boot-params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:18 -04:00
Nicolas Pitre 4611b68922 ARM: mach-u300: convert boot_params to atag_offset 
Someone was smoking good stuff with CONFIG_MACH_U300_2MB_ALIGNMENT_FIX here...

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:18 -04:00
Nicolas Pitre b61cafee2e ARM: mach-tegra: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:17 -04:00
Nicolas Pitre a1985dd97e ARM: mach-tcc8k: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:15 -04:00
Nicolas Pitre dfd48fbbb4 ARM: mach-spear*: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:15 -04:00
Nicolas Pitre 8322cd4bf1 ARM: mach-shark: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:14 -04:00
Nicolas Pitre 17f4425d5b ARM: mach-sa1100: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:13 -04:00
Nicolas Pitre 02350a1f8b ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:12 -04:00
Nicolas Pitre 170a59080d ARM: mach-s3c64xx: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:11 -04:00
Nicolas Pitre 32bc82010b ARM: mach-s5p64x0: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:10 -04:00
Nicolas Pitre 69d50710c6 ARM: mach-s3c24*: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:09 -04:00
Nicolas Pitre 237e88739e ARM: mach-rpc: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:09 -04:00
Nicolas Pitre 9ddea57eb7 ARM: mach-realview: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:08 -04:00
Nicolas Pitre 7375aba673 ARM: mach-pxa: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:07 -04:00
Nicolas Pitre d7a8a58e07 ARM: mach-pnx4008: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:06 -04:00
Nicolas Pitre 65aa1b1ea4 ARM: mach-orion5x: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:05 -04:00
Nicolas Pitre 5e52b435b7 ARM: mach-omap2: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:05 -04:00
Nicolas Pitre 246e389d2a ARM: mach-omap1: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:04 -04:00
Nicolas Pitre 03150fb6a5 ARM: mach-nuc93x: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:03 -04:00
Nicolas Pitre 013b5fb283 ARM: mach-nomadik: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:02 -04:00
Nicolas Pitre b11fd42cad ARM: mach-netx: convert boot_params to atag_offset 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
 2011-08-21 17:15:01 -04:00