Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'omap-for-v6.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/arm

ARM: OMAP2+: Fix falg->flag typo in omap_smc2()

* tag 'omap-for-v6.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
ARM: OMAP2+: Fix falg->flag typo in omap_smc2()

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+2 -2
+1 -1
arch/arm/mach-omap2/omap-secure.h
··· 68 68 u32 arg1, u32 arg2, u32 arg3, u32 arg4); 69 69 extern void omap_smccc_smc(u32 fn, u32 arg); 70 70 extern void omap_smc1(u32 fn, u32 arg); 71 - extern u32 omap_smc2(u32 id, u32 falg, u32 pargs); 71 + extern u32 omap_smc2(u32 id, u32 flag, u32 pargs); 72 72 extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs); 73 73 extern int omap_secure_ram_reserve_memblock(void); 74 74 extern u32 save_secure_ram_context(u32 args_pa);
+1 -1
arch/arm/mach-omap2/omap-smc.S
··· 32 32 ENDPROC(_omap_smc1) 33 33 34 34 /** 35 - * u32 omap_smc2(u32 id, u32 falg, u32 pargs) 35 + * u32 omap_smc2(u32 id, u32 flag, u32 pargs) 36 36 * Low level common routine for secure HAL and PPA APIs. 37 37 * @id: Application ID of HAL APIs 38 38 * @flag: Flag to indicate the criticality of operation