Ignore:
Timestamp:
Apr 14, 2017, 9:41:36 PM (3 months ago)
Author:
brainslayer
Message:

kernel update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-4.9/arch/arm64/kernel/smccc-call.S

    r31574 r31859  
    1313 */
    1414#include <linux/linkage.h>
     15#include <linux/arm-smccc.h>
    1516#include <asm/asm-offsets.h>
    1617
     
    2122        stp     x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS]
    2223        stp     x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS]
    23         ret
     24        ldr     x4, [sp, #8]
     25        cbz     x4, 1f /* no quirk structure */
     26        ldr     x9, [x4, #ARM_SMCCC_QUIRK_ID_OFFS]
     27        cmp     x9, #ARM_SMCCC_QUIRK_QCOM_A6
     28        b.ne    1f
     29        str     x6, [x4, ARM_SMCCC_QUIRK_STATE_OFFS]
     301:      ret
    2431        .cfi_endproc
    2532        .endm
     
    2835 * void arm_smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,
    2936 *                unsigned long a3, unsigned long a4, unsigned long a5,
    30  *                unsigned long a6, unsigned long a7, struct arm_smccc_res *res)
     37 *                unsigned long a6, unsigned long a7, struct arm_smccc_res *res,
     38 *                struct arm_smccc_quirk *quirk)
    3139 */
    32 ENTRY(arm_smccc_smc)
     40ENTRY(__arm_smccc_smc)
    3341        SMCCC   smc
    34 ENDPROC(arm_smccc_smc)
     42ENDPROC(__arm_smccc_smc)
    3543
    3644/*
    3745 * void arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,
    3846 *                unsigned long a3, unsigned long a4, unsigned long a5,
    39  *                unsigned long a6, unsigned long a7, struct arm_smccc_res *res)
     47 *                unsigned long a6, unsigned long a7, struct arm_smccc_res *res,
     48 *                struct arm_smccc_quirk *quirk)
    4049 */
    41 ENTRY(arm_smccc_hvc)
     50ENTRY(__arm_smccc_hvc)
    4251        SMCCC   hvc
    43 ENDPROC(arm_smccc_hvc)
     52ENDPROC(__arm_smccc_hvc)
Note: See TracChangeset for help on using the changeset viewer.