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

Commit 57260e40 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

From Sascha Hauer <s.hauer@pengutronix.de>:

ARM i.MX fixes for 3.7-rc

* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6

:
  ARM: imx: ehci: fix host power mask bit
  ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2d4d07b9 3d5e2abe

Documentation/arm64/memory.txt

+6 −6
Original line number Original line Diff line number Diff line
@@ -27,17 +27,17 @@ Start End Size Use 
-----------------------------------------------------------------------

-----------------------------------------------------------------------

0000000000000000	0000007fffffffff	 512GB		user

0000000000000000	0000007fffffffff	 512GB		user





ffffff8000000000	ffffffbbfffcffff	~240GB		vmalloc

ffffff8000000000	ffffffbbfffeffff	~240GB		vmalloc





ffffffbbfffd0000	ffffffbcfffdffff	  64KB		[guard page]

ffffffbbffff0000	ffffffbbffffffff	  64KB		[guard page]





ffffffbbfffe0000	ffffffbcfffeffff	  64KB		PCI I/O space

ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap





ffffffbbffff0000	ffffffbcffffffff	  64KB		[guard page]

ffffffbe00000000	ffffffbffbbfffff	  ~8GB		[guard, future vmmemap]





ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap

ffffffbffbe00000	ffffffbffbe0ffff	  64KB		PCI I/O space





ffffffbe00000000	ffffffbffbffffff	  ~8GB		[guard, future vmmemap]

ffffffbbffff0000	ffffffbcffffffff	  ~2MB		[guard]





ffffffbffc000000	ffffffbfffffffff	  64MB		modules

ffffffbffc000000	ffffffbfffffffff	  64MB		modules

Makefile

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

VERSION = 3

PATCHLEVEL = 7

PATCHLEVEL = 7

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Terrified Chipmunk

NAME = Terrified Chipmunk





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/include/asm/io.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); 
static inline void __raw_writew(u16 val, volatile void __iomem *addr)

static inline void __raw_writew(u16 val, volatile void __iomem *addr)

{

{

	asm volatile("strh %1, %0"

	asm volatile("strh %1, %0"

		     : "+Qo" (*(volatile u16 __force *)addr)

		     : "+Q" (*(volatile u16 __force *)addr)

		     : "r" (val));

		     : "r" (val));

}

}
@@ -72,7 +72,7 @@ static inline u16 __raw_readw(const volatile void __iomem *addr) 
{

{

	u16 val;

	u16 val;

	asm volatile("ldrh %1, %0"

	asm volatile("ldrh %1, %0"

		     : "+Qo" (*(volatile u16 __force *)addr),

		     : "+Q" (*(volatile u16 __force *)addr),

		       "=r" (val));

		       "=r" (val));

	return val;

	return val;

}

}

arch/arm/include/asm/sched_clock.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,5 @@ 




extern void sched_clock_postinit(void);

extern void sched_clock_postinit(void);

extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);

extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);

extern void setup_sched_clock_needs_suspend(u32 (*read)(void), int bits,

		unsigned long rate);





#endif
 
#endif

arch/arm/include/asm/vfpmacros.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -27,9 +27,9 @@ 
#if __LINUX_ARM_ARCH__ <= 6

#if __LINUX_ARM_ARCH__ <= 6

	ldr	\tmp, =elf_hwcap		    @ may not have MVFR regs

	ldr	\tmp, =elf_hwcap		    @ may not have MVFR regs

	ldr	\tmp, [\tmp, #0]

	ldr	\tmp, [\tmp, #0]

	tst	\tmp, #HWCAP_VFPv3D16

	tst	\tmp, #HWCAP_VFPD32

	ldceql	p11, cr0, [\base],#32*4		    @ FLDMIAD \base!, {d16-d31}

	ldcnel	p11, cr0, [\base],#32*4		    @ FLDMIAD \base!, {d16-d31}

	addne	\base, \base, #32*4		    @ step over unused register space

	addeq	\base, \base, #32*4		    @ step over unused register space

#else

#else

	VFPFMRX	\tmp, MVFR0			    @ Media and VFP Feature Register 0

	VFPFMRX	\tmp, MVFR0			    @ Media and VFP Feature Register 0

	and	\tmp, \tmp, #MVFR0_A_SIMD_MASK	    @ A_SIMD field

	and	\tmp, \tmp, #MVFR0_A_SIMD_MASK	    @ A_SIMD field
@@ -51,9 +51,9 @@ 
#if __LINUX_ARM_ARCH__ <= 6

#if __LINUX_ARM_ARCH__ <= 6

	ldr	\tmp, =elf_hwcap		    @ may not have MVFR regs

	ldr	\tmp, =elf_hwcap		    @ may not have MVFR regs

	ldr	\tmp, [\tmp, #0]

	ldr	\tmp, [\tmp, #0]

	tst	\tmp, #HWCAP_VFPv3D16

	tst	\tmp, #HWCAP_VFPD32

	stceql	p11, cr0, [\base],#32*4		    @ FSTMIAD \base!, {d16-d31}

	stcnel	p11, cr0, [\base],#32*4		    @ FSTMIAD \base!, {d16-d31}

	addne	\base, \base, #32*4		    @ step over unused register space

	addeq	\base, \base, #32*4		    @ step over unused register space

#else

#else

	VFPFMRX	\tmp, MVFR0			    @ Media and VFP Feature Register 0

	VFPFMRX	\tmp, MVFR0			    @ Media and VFP Feature Register 0

	and	\tmp, \tmp, #MVFR0_A_SIMD_MASK	    @ A_SIMD field

	and	\tmp, \tmp, #MVFR0_A_SIMD_MASK	    @ A_SIMD field