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

Commit 45b5bed7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 's5p-fixes-for-linus' of... 

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S5PV310: Fix on Secondary CPU startup
  ARM: S5PV310: Bug fix on uclk1 and sclk_pwm
  ARM: S5PV310: Fix missed uart clocks
  ARM: S5PV310: Should be clk_sclk_apll not clk_mout_apll
  ARM: S5PV310: Fix on PLL setting for S5PV310
  ARM: S5PV310: Add CMU block for S5PV310 Clock
  ARM: S5PV310: Fix on typo irqs.h of S5PV310
  ARM: S5PV310: Fix on default ZRELADDR of ARCH_S5PV310
  ARM: S5PV310: Fix on GPIO base addresses
  ARM: SAMSUNG: Fix on build warning regarding VMALLOC_END type
  ARM: S5P: VMALLOC_END should be unsigned long
parents 30c0f6a0 766211e7

arch/arm/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -1622,7 +1622,8 @@ config ZRELADDR 
	default 0x40008000 if ARCH_STMP378X ||\

	default 0x40008000 if ARCH_STMP378X ||\

		ARCH_STMP37XX ||\

		ARCH_STMP37XX ||\

		ARCH_SH7372 ||\

		ARCH_SH7372 ||\

		ARCH_SH7377

		ARCH_SH7377 ||\

		ARCH_S5PV310

	default 0x50008000 if ARCH_S3C64XX ||\

	default 0x50008000 if ARCH_S3C64XX ||\

		ARCH_SH7367

		ARCH_SH7367

	default 0x60008000 if ARCH_VEXPRESS

	default 0x60008000 if ARCH_VEXPRESS

arch/arm/mach-s3c2410/include/mach/vmalloc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,6 @@ 
#ifndef __ASM_ARCH_VMALLOC_H

#ifndef __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H





#define VMALLOC_END	  (0xE0000000)

#define VMALLOC_END	0xE0000000UL





#endif /* __ASM_ARCH_VMALLOC_H */
 
#endif /* __ASM_ARCH_VMALLOC_H */

arch/arm/mach-s3c64xx/include/mach/vmalloc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,6 @@ 
#ifndef __ASM_ARCH_VMALLOC_H

#ifndef __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H





#define VMALLOC_END	  (0xE0000000)

#define VMALLOC_END	0xE0000000UL





#endif /* __ASM_ARCH_VMALLOC_H */
 
#endif /* __ASM_ARCH_VMALLOC_H */

arch/arm/mach-s5p6440/include/mach/vmalloc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,6 +12,6 @@ 
#ifndef __ASM_ARCH_VMALLOC_H

#ifndef __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H





#define VMALLOC_END	  (0xE0000000)

#define VMALLOC_END	0xE0000000UL





#endif /* __ASM_ARCH_VMALLOC_H */
 
#endif /* __ASM_ARCH_VMALLOC_H */

arch/arm/mach-s5p6442/include/mach/vmalloc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,6 +12,6 @@ 
#ifndef __ASM_ARCH_VMALLOC_H

#ifndef __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H





#define VMALLOC_END	  (0xE0000000)

#define VMALLOC_END	0xE0000000UL





#endif /* __ASM_ARCH_VMALLOC_H */
 
#endif /* __ASM_ARCH_VMALLOC_H */