linux.git/arch, branch v3.1-rc7

Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

2011-09-20T21:23:16+00:00

* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
  mach-integrator: fix VGA base regression
  arm/dt: Tegra: Update SDHCI nodes to match bindings
  ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines
  ARM: SAMSUNG: fix to prevent declaring duplicated
  ARM: SAMSUNG: fix watchdog reset issue with clk_get()
  ARM: S3C64XX: Remove un-used code backlight code on SMDK6410
  ARM: EXYNOS4: restart clocksource while system resumes
  ARM: EXYNOS4: Fix routing timer interrupt to offline CPU
  ARM: EXYNOS4: Fix return type of local_timer_setup()
  ARM: EXYNOS4: Fix wrong pll type for vpll
  ARM: Dove: fix second SPI initialization call

mach-integrator: fix VGA base regression

2011-09-20T20:58:41+00:00

The changes introduced in commit
cc22b4c18540e5e8bf55c7d124044f9317527d3c
"ARM: set vga memory base at run-time"

Makes the Integrator/AP freeze completely. I appears that
this is due to the VGA base address being assigned at PCI
init time, while this base is needed earlier than that.
Moving the initialization of the base address to the
.map_io function solves this problem.

Cc: Rob Herring 
Cc: Nicolas Pitre 
Cc: Arnd Bergmann 
Signed-off-by: Linus Walleij 
Acked-by: Rob Herring 
Signed-off-by: Arnd Bergmann

arm/dt: Tegra: Update SDHCI nodes to match bindings

2011-09-20T20:56:53+00:00

The bindings were recently updated to have separate properties for each
type of GPIO. Update the Device Tree source to match that.

Signed-off-by: Stephen Warren 
Acked-by: Olof Johansson 
Signed-off-by: Arnd Bergmann

Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen

2011-09-16T18:28:11+00:00

* 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen:
  xen/i386: follow-up to "replace order-based range checking of M2P table by linear one"
  xen/irq: Alter the locking to use a mutex instead of a spinlock.
  xen/e820: if there is no dom0_mem=, don't tweak extra_pages.
  xen: disable PV spinlocks on HVM

asm alternatives: remove incorrect alignment notes

2011-09-15T20:28:33+00:00

On x86-64, they were just wasteful: with the explicitly added (now
unnecessary) padding, the size of the alternatives structure was 16
bytes, and an alignment of 8 bytes didn't hurt much.

However, it was still silly, since the natural size and alignment for
the structure is actually just 12 bytes, 4-byte aligned since commit
59e97e4d6fbc ("x86: Make alternative instruction pointers relative").
So removing the padding, and removing the extra alignment is just a good
idea.

On x86-32, the alignment of 4 bytes was correct, but was incorrectly
hardcoded as 8 bytes in .  That header file had
used to be an x86-64 only header file, but various unification efforts
have made it be used for x86-32 too (ie the unification of rwlock and
rwsem).

That in turn caused x86-32 boot failures, because the extra alignment
would result in random zero-filled words in the altinstructions section,
causing oopses early at boot when doing alternative instruction
replacement.

So just remove all the alignment noise entirely.  It's wrong, and it's
unnecessary.  The section itself is already properly aligned by the
linker scripts, and all additions to the section had better be of the
proper 12-byte format, keeping it aligned.  So if the align directive
were to ever make a difference, that would be an indication of a serious
bug to begin with.

Reported-by: Werner Landgraf 
Acked-by: Andrew Lutomirski 
Signed-off-by: Linus Torvalds

Merge branch 'samsung-fixes-2' of git://github.com/kgene/linux-samsung into HEAD

2011-09-15T15:28:07+00:00

xen/i386: follow-up to "replace order-based range checking of M2P table by linear one"

2011-09-15T08:39:46+00:00

The numbers obtained from the hypervisor really can't ever lead to an
overflow here, only the original calculation going through the order
of the range could have. This avoids the (as Jeremy points outs)
somewhat ugly NULL-based calculation here.

Signed-off-by: Jan Beulich 
Signed-off-by: Konrad Rzeszutek Wilk

ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines

2011-09-15T06:54:20+00:00

The keypad controller requires a external pull-up for all the keypad
row lines. Fix the incorrect pad configuration for keypad controller
row lines by enabling the pad pull-up for the all row lines of the
keypad controller.

Signed-off-by: Thomas Abraham 
Signed-off-by: Kukjin Kim

ARM: SAMSUNG: fix to prevent declaring duplicated

2011-09-15T06:54:15+00:00

The plat/clock.h revised to prevent declaring duplicated.

Signed-off-by: Kukjin Kim

ARM: SAMSUNG: fix watchdog reset issue with clk_get()

2011-09-15T04:59:58+00:00

clkdev framework uses global mutex to protect clock tree, so it is not
possible to call clk_get() in interrupt context. This patch fixes this
issue and makes system reset by watchdog call working again.

Signed-off-by: Marek Szyprowski 
Signed-off-by: Kyungmin Park 
Signed-off-by: Kukjin Kim