Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07f0e62e authored by Chris Mason's avatar Chris Mason
Browse files

Merge tag 'v3.11' into for-linus 

Linux 3.11
parents d7396f07 6e466452

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6066,7 +6066,7 @@ M: Rob Herring <rob.herring@calxeda.com> 
M:	Pawel Moll <pawel.moll@arm.com>

M:	Mark Rutland <mark.rutland@arm.com>

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Ian Campbell <ian.campbell@citrix.com>

M:	Ian Campbell <ijc+devicetree@hellion.org.uk>

L:	devicetree@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Linux for Workgroups



# *DOCUMENTATION*

arch/arm/mach-prima2/common.c

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ static const char *atlas6_dt_match[] __initdata = { 


DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.nr_irqs	= 128,

	.map_io         = sirfsoc_map_io,

	.init_time	= sirfsoc_init_time,

	.init_late	= sirfsoc_init_late,
@@ -59,7 +58,6 @@ static const char *prima2_dt_match[] __initdata = { 


DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.nr_irqs	= 128,

	.map_io         = sirfsoc_map_io,

	.init_time	= sirfsoc_init_time,

	.dma_zone_size	= SZ_256M,

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -979,6 +979,7 @@ config RELOCATABLE 
	  must live at a different physical address than the primary

	  kernel.



# This value must have zeroes in the bottom 60 bits otherwise lots will break

config PAGE_OFFSET

	hex

	default "0xc000000000000000"

arch/powerpc/include/asm/page.h

+10 −0
Original line number Diff line number Diff line
@@ -211,9 +211,19 @@ extern long long virt_phys_offset; 
#define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + VIRT_PHYS_OFFSET))

#define __pa(x) ((unsigned long)(x) - VIRT_PHYS_OFFSET)

#else

#ifdef CONFIG_PPC64

/*

 * gcc miscompiles (unsigned long)(&static_var) - PAGE_OFFSET

 * with -mcmodel=medium, so we use & and | instead of - and + on 64-bit.

 */

#define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) | PAGE_OFFSET))

#define __pa(x) ((unsigned long)(x) & 0x0fffffffffffffffUL)



#else /* 32-bit, non book E */

#define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + PAGE_OFFSET - MEMORY_START))

#define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START)

#endif

#endif



/*

 * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI,