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

Commit 3cdc3acc authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes

parents 3c52b2be eca55f4d

arch/arm/mach-msm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o 
obj-$(CONFIG_MSM_SMD) += last_radio_log.o

obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o



CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)



obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

obj-$(CONFIG_SMP) += headsmp.o platsmp.o

arch/arm/mach-msm/board-msm7x30.c

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ 


extern struct sys_timer msm_timer;



static void __init msm7x30_fixup(struct machine_desc *desc, struct tag *tag,

			 char **cmdline, struct meminfo *mi)

static void __init msm7x30_fixup(struct tag *tag, char **cmdline,

		struct meminfo *mi)

{

	for (; tag->hdr.size; tag = tag_next(tag))

		if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) {

arch/arm/mach-msm/board-msm8960.c

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 


#include "devices.h"



static void __init msm8960_fixup(struct machine_desc *desc, struct tag *tag,

			 char **cmdline, struct meminfo *mi)

static void __init msm8960_fixup(struct tag *tag, char **cmdline,

		struct meminfo *mi)

{

	for (; tag->hdr.size; tag = tag_next(tag))

		if (tag->hdr.tag == ATAG_MEM &&

arch/arm/mach-msm/board-msm8x60.c

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include <mach/board.h>

#include <mach/msm_iomap.h>



static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag,

			 char **cmdline, struct meminfo *mi)

static void __init msm8x60_fixup(struct tag *tag, char **cmdline,

		struct meminfo *mi)

{

	for (; tag->hdr.size; tag = tag_next(tag))

		if (tag->hdr.tag == ATAG_MEM &&

arch/arm/mach-msm/scm.c

+3 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ static u32 smc(u32 cmd_addr) 
			__asmeq("%1", "r0")

			__asmeq("%2", "r1")

			__asmeq("%3", "r2")

#ifdef REQUIRES_SEC

			".arch_extension sec\n"

#endif

			"smc	#0	@ switch to secure world\n"

			: "=r" (r0)

			: "r" (r0), "r" (r1), "r" (r2)