Commits · 69d50710c62b24ee2e7e51b34031fec58396ac02 · nexedi / linux

21 Aug, 2011 36 commits

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
ARM: mach-realview: convert boot_params to atag_offset · 9ddea57e
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
9ddea57e
ARM: mach-pxa: convert boot_params to atag_offset · 7375aba6
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
7375aba6
ARM: mach-pnx4008: convert boot_params to atag_offset · d7a8a58e
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
d7a8a58e
ARM: mach-orion5x: convert boot_params to atag_offset · 65aa1b1e
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
65aa1b1e

ARM: mach-omap2: convert boot_params to atag_offset · 5e52b435

Nicolas Pitre authored Jul 05, 2011

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>

5e52b435

ARM: mach-omap1: convert boot_params to atag_offset · 246e389d

Nicolas Pitre authored Jul 05, 2011

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>

246e389d

ARM: mach-nuc93x: convert boot_params to atag_offset · 03150fb6
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
03150fb6
ARM: mach-nomadik: convert boot_params to atag_offset · 013b5fb2
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
013b5fb2
ARM: mach-netx: convert boot_params to atag_offset · b11fd42c
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
b11fd42c
ARM: mach-mx5: convert boot_params to atag_offset · 6192935c
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
6192935c
ARM: mach-mv78xx0: convert boot_params to atag_offset · 5bc9291a
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
5bc9291a
ARM: mach-msm: convert boot_params to atag_offset · f631dd41
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
f631dd41
ARM: mach-lpc32xx: convert boot_params to atag_offset · bdec5ddd
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
bdec5ddd
ARM: mach-ks8695: convert boot_params to atag_offset · 0318ce93
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
0318ce93
ARM: mach-kirkwood: convert boot_params to atag_offset · 1b7bd28c
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
1b7bd28c
ARM: mach-ixp4xx: convert boot_params to atag_offset · e022c729
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
e022c729
ARM: mach-ixp23xx: convert boot_params to atag_offset · 36f7a1e7
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
36f7a1e7
ARM: mach-ixp2000: convert boot_params to atag_offset · ade59318
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
ade59318
ARM: mach-iop33x: convert boot_params to atag_offset · e5c76c00
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
e5c76c00
ARM: mach-iop32x: convert boot_params to atag_offset · 1896746d
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
1896746d
ARM: mach-iop13xx: convert boot_params to atag_offset · d304c54e
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
d304c54e
ARM: mach-integrator: convert boot_params to atag_offset · c5e587a2
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
c5e587a2
ARM: mach-imx: convert boot_params to atag_offset · dc8f1907
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
dc8f1907

ARM: mach-h720x: convert boot_params to atag_offset · 3746f022

Nicolas Pitre authored Jul 05, 2011

The value used for boot_params in h7201-eval.c is nonsensical, given that
PLAT_PHYS_OFFSET is defined to 0x40000000.  Left unchanged to purposely
break the build to get its maintainer's attention.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

3746f022

ARM: mach-gemini: convert boot_params to atag_offset · 2b078cdd
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
2b078cdd
ARM: mach-footbridge: convert boot_params to atag_offset · 93ef8883
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
93ef8883
ARM: mach-exynos4: convert boot_params to atag_offset · 2be5a4a7
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
2be5a4a7

ARM: mach-ep93xx: convert boot_params to atag_offset · e562cf17

Nicolas Pitre authored Jul 05, 2011

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Petr Štetiar <ynezz@true.cz>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>

e562cf17

ARM: mach-ebsa110: convert boot_params to atag_offset · 5eb980f3
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
5eb980f3
ARM: mach-dove: convert boot-params to atag_offset · 57fa5720
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
57fa5720
ARM: mach-davinci: convert boot_params to atag_offset · e7e56014
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
e7e56014
ARM: mach-cns3xxx: convert boot_params to atag_offset · 03e67202
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
03e67202
ARM: mach-clps711x: convert boot_params to atag_offset · 6244fa9c
Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
```
6244fa9c

ARM: introduce atag_offset to replace boot_params · 2bb9839e

Nicolas Pitre authored Jul 05, 2011

The boot_params member of the mdesc structure is used to provide a
default physical address for the ATAG list.  Since this value is fixed
at compile time and sometimes based on constants such as ARCH_PHYS_OFFSET,
it gets in the way of runtime PHYS_OFFSET and CONFIG_ARM_PATCH_PHYS_VIRT
usage.

Let's introduce atag_offset which should contains only the relative
offset from PHYS_OFFSET instead of an absolute value, in preparation
to move all instance of boot_params over to it.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: Petr Štetiar <ynezz@true.cz>
Acked-by: Arnd Bergmann <arnd@arndb.de>

2bb9839e

14 Aug, 2011 4 commits

Linux 3.1-rc2 · 93ee7a93
Linus Torvalds authored Aug 14, 2011

93ee7a93

mm: fix wrong vmap address calculations with odd NR_CPUS values · f982f915

Clemens Ladisch authored Jun 21, 2011

Commit db64fe02 ("mm: rewrite vmap layer") introduced code that does
address calculations under the assumption that VMAP_BLOCK_SIZE is a
power of two.  However, this might not be true if CONFIG_NR_CPUS is not
set to a power of two.

Wrong vmap_block index/offset values could lead to memory corruption.
However, this has never been observed in practice (or never been
diagnosed correctly); what caught this was the BUG_ON in vb_alloc() that
checks for inconsistent vmap_block indices.

To fix this, ensure that VMAP_BLOCK_SIZE always is a power of two.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=31572Reported-by: Pavel Kysilka <goldenfish@linuxsoft.cz>
Reported-by: Matias A. Fonzo <selk@dragora.org>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: 2.6.28+ <stable@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

f982f915

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 97c24d1d

Linus Torvalds authored Aug 14, 2011

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: remove unused "ddr" parameter in struct mmc_ios
  mmc: dw_mmc: Fix DDR mode support.
  mmc: core: use defined R1_STATE_PRG macro for card status
  mmc: sdhci: use f_max instead of host->clock for timeouts
  mmc: sdhci: move timeout_clk calculation farther down
  mmc: sdhci: check host->clock before using it as a denominator
  mmc: Revert "mmc: sdhci: Fix SDHCI_QUIRK_TIMEOUT_USES_SDCLK"
  mmc: tmio: eliminate unused variable 'mmc' warning
  mmc: esdhc-imx: fix card interrupt loss on freescale eSDHC
  mmc: sdhci-s3c: Fix build for header change
  mmc: dw_mmc: Fix mask in IDMAC_SET_BUFFER1_SIZE macro
  mmc: cb710: fix possible pci_dev leak in cb710_pci_configure()
  mmc: core: Detect eMMC v4.5 ext_csd entries
  mmc: mmc_test: avoid stalled file in debugfs
  mmc: sdhci-s3c: add BROKEN_ADMA_ZEROLEN_DESC quirk
  mmc: sdhci: pxav3: controller needs 32 bit ADMA addressing
  mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

97c24d1d

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 91d85ea6

Linus Torvalds authored Aug 13, 2011

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (ibmaem) add missing kfree
  hwmon: (pmbus/lm25066) Ignore byte writes to non-zero pages
  hwmon: (pmbus) Virtualize pmbus_write_byte

91d85ea6