diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
commit | a1fb6696c662920f695c97591d759391aca8a1ad (patch) | |
tree | 25cc9ca4d1d291e122ff694dd41a9cc6d6513f60 /arch/arm/mach-qcom/scm-boot.c | |
parent | 1f40a8bfa91adfa8d1ac5013c08c76f6fd6691ad (diff) | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-qcom/scm-boot.c')
-rw-r--r-- | arch/arm/mach-qcom/scm-boot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-qcom/scm-boot.c b/arch/arm/mach-qcom/scm-boot.c index 45cee3e469a5..e8ff7beb6218 100644 --- a/arch/arm/mach-qcom/scm-boot.c +++ b/arch/arm/mach-qcom/scm-boot.c @@ -24,15 +24,15 @@ /* * Set the cold/warm boot address for one of the CPU cores. */ -int scm_set_boot_addr(phys_addr_t addr, int flags) +int scm_set_boot_addr(u32 addr, int flags) { struct { - unsigned int flags; - phys_addr_t addr; + __le32 flags; + __le32 addr; } cmd; - cmd.addr = addr; - cmd.flags = flags; + cmd.addr = cpu_to_le32(addr); + cmd.flags = cpu_to_le32(flags); return scm_call(SCM_SVC_BOOT, SCM_BOOT_ADDR, &cmd, sizeof(cmd), NULL, 0); } |