mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Merge remote-tracking branch 'origin/staging' into staging
This commit is contained in:
Ian Jackson committed
commit
890ceb9453
3 files changed
+4
-2
No files matched your search
@@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
|
||||
endif
|
||||
OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5
|
||||
QEMU_UPSTREAM_REVISION ?= master
|
||||
MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
|
||||
MINIOS_UPSTREAM_REVISION ?= 9f09744aa3e5982a083ecf8e9cd2123f477081f9
|
||||
|
||||
SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0
|
||||
|
||||
|
||||
@@ -98,10 +98,12 @@ lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map
|
||||
|
||||
# If abi-dumper is available, write out the ABI analysis
|
||||
ifneq ($(ABI_DUMPER),)
|
||||
ifneq ($(nosharedlibs),y)
|
||||
libs: $(PKG_ABI)
|
||||
$(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst
|
||||
$(ABI_DUMPER) $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR)
|
||||
endif
|
||||
endif
|
||||
|
||||
.PHONY: install
|
||||
install: build
|
||||
|
||||
@@ -1692,7 +1692,7 @@ static bool optee_handle_call(struct cpu_user_regs *regs)
|
||||
return true;
|
||||
|
||||
case OPTEE_SMC_DISABLE_SHM_CACHE:
|
||||
arm_smccc_smc(OPTEE_SMC_ENABLE_SHM_CACHE, 0, 0, 0, 0, 0, 0,
|
||||
arm_smccc_smc(OPTEE_SMC_DISABLE_SHM_CACHE, 0, 0, 0, 0, 0, 0,
|
||||
OPTEE_CLIENT_ID(current->domain), &resp);
|
||||
set_user_reg(regs, 0, resp.a0);
|
||||
if ( resp.a0 == OPTEE_SMC_RETURN_OK ) {
|
||||
|
||||