Commits · 98b0124f0e2b88ec74cbd9345cf6195e527ce251 · nexedi / linux

06 Sep, 2011 1 commit

ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · 98b0124f

Nicolas Pitre authored Sep 02, 2011

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>

98b0124f

29 Aug, 2011 1 commit
- Merge the enabling by default of ARM_PATCH_PHYS_VIRT · 96f90c79
  Nicolas Pitre authored Aug 29, 2011
```
Conflicts:
	arch/arm/mach-msm/board-msm7x30.c
```
  96f90c79
23 Aug, 2011 2 commits
- Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable · ad30a2bb
  Russell King authored Aug 23, 2011
  
  ad30a2bb
- Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable · 0cd21ebc
  Russell King authored Aug 23, 2011
  
  0cd21ebc
22 Aug, 2011 18 commits

Linux 3.1-rc3 · fcb8ce5c
Linus Torvalds authored Aug 22, 2011

fcb8ce5c

Merge branch 'perf-urgent-for-linus' of... · 8f6544ed

Linus Torvalds authored Aug 22, 2011

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

8f6544ed

Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 4762e252

Linus Torvalds authored Aug 22, 2011

* '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

4762e252

xen/tracing: Fix tracing config option properly · 60c5f08e

Jeremy Fitzhardinge authored Aug 11, 2011

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>

60c5f08e

xen: Do not enable PV IPIs when vector callback not present · 3c05c4be

Stefano Stabellini authored Aug 17, 2011

Fix regression for HVM case on older (<4.1.1) hypervisors caused by

  commit 99bbb3a8
  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>

3c05c4be

ARM: Remove support for macro CONSISTENT_DMA_SIZE · 97fef8bd
Jon Medhurst authored Aug 04, 2011
```
There are now no platforms which set this macro.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
```
97fef8bd

ARM: mach-shmobile: Setup consistent dma size at boot time · 9b742024

Jon Medhurst authored Aug 04, 2011

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Paul Mundt <lethal@linux-sh.org>
CC: Magnus Damm <magnus.damm@gmail.com>

9b742024

ARM: mach-bcmring: Setup consistent dma size at boot time · 2d5e975b

Jon Medhurst authored Aug 04, 2011

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Jiandong Zheng <jdzheng@broadcom.com>
CC: Scott Branden <sbranden@broadcom.com>

2d5e975b

ARM: mach-at91: Setup consistent dma size at boot time · f407c2e3
Jon Medhurst authored Aug 04, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Ferre<nicolas.ferre@atmel.com>
```
f407c2e3

ARM: mach-u300: Setup consistent dma size at boot time · d70a5969

Jon Medhurst authored Aug 04, 2011

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>

d70a5969

ARM: mach-davinci: Setup consistent dma size at boot time · fd24f903

Jon Medhurst authored Aug 04, 2011

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>

fd24f903

ARM: mxc: Remove setting of consistent dma size · 389d12cc

Jon Medhurst authored Aug 22, 2011

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>

389d12cc

ARM: mach-s5pv210: Setup consistent dma size at boot time · a06a58ab
Jon Medhurst authored Aug 04, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Kukjin Kim <kgene.kim@samsung.com>
```
a06a58ab
ARM: mach-s5p64x0: Setup consistent dma size at boot time · d9c295ad
Jon Medhurst authored Aug 04, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Kukjin Kim <kgene.kim@samsung.com>
```
d9c295ad
ARM: mach-s3c64xx: Setup consistent dma size at boot time · 284dc060
Jon Medhurst authored Aug 04, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Ben Dooks <ben-linux@fluff.org>
```
284dc060
ARM: omap: Setup consistent dma size at boot time · 009426a0
Jon Medhurst authored Aug 03, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Tony Lindgren <tony@atomide.com>
```
009426a0

ARM: Add init_consistent_dma_size() · 99d1717d

Jon Medhurst authored Aug 02, 2011

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>

99d1717d

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 3210d190

Linus Torvalds authored Aug 21, 2011

* '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

3210d190

21 Aug, 2011 18 commits

ARM: remove boot_params from struct machine_desc · af687168

Nicolas Pitre authored Jul 05, 2011

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>

af687168

ARM: mach-prima2: convert boot_params to atag_offset · 0cc9311f
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
0cc9311f
ARM: mach-w90x900: remove useless boot_params entries · b84047e5
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
b84047e5
ARM: mach-vt8500: convert boot_params to atag_offset · 59a0e0c5
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
59a0e0c5
ARM: vexpress: convert boot_params to atag_offset · e9ce8e5b
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
e9ce8e5b
ARM: mach-versatile: convert boot-params to atag_offset · 171fa8a7
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
171fa8a7

ARM: mach-ux500: convert boot-params to atag_offset · bc77b1aa

Nicolas Pitre authored Jul 05, 2011

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

bc77b1aa

ARM: mach-u300: convert boot_params to atag_offset · 4611b689

Nicolas Pitre authored Jul 05, 2011

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>

4611b689

ARM: mach-tegra: convert boot_params to atag_offset · b61cafee
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
b61cafee
ARM: mach-tcc8k: convert boot_params to atag_offset · a1985dd9
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
a1985dd9
ARM: mach-spear*: convert boot_params to atag_offset · dfd48fbb
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
dfd48fbb
ARM: mach-shark: convert boot_params to atag_offset · 8322cd4b
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
8322cd4b
ARM: mach-sa1100: convert boot_params to atag_offset · 17f4425d
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
17f4425d
ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset · 02350a1f
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
02350a1f
ARM: mach-s3c64xx: convert boot_params to atag_offset · 170a5908
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
170a5908
ARM: mach-s5p64x0: convert boot_params to atag_offset · 32bc8201
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
32bc8201
ARM: mach-s3c24*: convert boot_params to atag_offset · 69d50710
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
69d50710
ARM: mach-rpc: convert boot_params to atag_offset · 237e8873
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
237e8873