From: Seth Forshee Date: Wed, 18 Jan 2017 13:37:59 +0000 (-0600) Subject: UBUNTU: ubuntu: vbox -- Update to 5.1.14-dfsg-1 X-Git-Tag: Ubuntu-4.10.0-9.11~123 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b94f26ec65bdfdc15819909ea7cdbd318fe65dbd;hp=50bbb648ac709ce2cd893c5c84225766f15c7bfa;p=mirror_ubuntu-zesty-kernel.git UBUNTU: ubuntu: vbox -- Update to 5.1.14-dfsg-1 Signed-off-by: Seth Forshee --- diff --git a/ubuntu/vbox/BOM b/ubuntu/vbox/BOM index c0c14575a428..299e73a85a5f 100644 --- a/ubuntu/vbox/BOM +++ b/ubuntu/vbox/BOM @@ -1,2 +1,2 @@ -Source: http://ports.ubuntu.com/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_5.1.10-dfsg-2_all.deb -Version: 5.1.10-dfsg-2 +Source: http://ports.ubuntu.com/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_5.1.14-dfsg-1_all.deb +Version: 5.1.14-dfsg-1 diff --git a/ubuntu/vbox/dkms.conf b/ubuntu/vbox/dkms.conf index e9a96b852c43..01be37209490 100644 --- a/ubuntu/vbox/dkms.conf +++ b/ubuntu/vbox/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="virtualbox-guest" -PACKAGE_VERSION="5.1.10" +PACKAGE_VERSION="5.1.14" CLEAN="rm -f *.*o" BUILT_MODULE_NAME[0]="vboxguest" BUILT_MODULE_LOCATION[0]="vboxguest" diff --git a/ubuntu/vbox/include/iprt/cdefs.h b/ubuntu/vbox/include/iprt/cdefs.h index 9dca4222e6b4..b56c167f0a1c 100644 --- a/ubuntu/vbox/include/iprt/cdefs.h +++ b/ubuntu/vbox/include/iprt/cdefs.h @@ -2943,7 +2943,7 @@ #define _8K 0x00002000 /** 16 K (Kilo) (16 384). */ #define _16K 0x00004000 -/** 32 K (Kilo) (32 678). */ +/** 32 K (Kilo) (32 768). */ #define _32K 0x00008000 /** 64 K (Kilo) (65 536). */ #if ARCH_BITS != 16 diff --git a/ubuntu/vbox/include/iprt/err.h b/ubuntu/vbox/include/iprt/err.h index 73ac9cf50844..3075b2e46359 100644 --- a/ubuntu/vbox/include/iprt/err.h +++ b/ubuntu/vbox/include/iprt/err.h @@ -2132,6 +2132,8 @@ RT_C_DECLS_END #define VERR_ASN1_INVALID_DATA_POINTER (-22854) /** The ASN.1 encoding is too deeply nested for the decoder. */ #define VERR_ASN1_TOO_DEEPLY_NESTED (-22855) +/** Generic unexpected object ID error. */ +#define VERR_ASN1_UNEXPECTED_OBJ_ID (-22856) /** ANS.1 internal error 1. */ #define VERR_ASN1_INTERNAL_ERROR_1 (-22895) diff --git a/ubuntu/vbox/include/iprt/mangling.h b/ubuntu/vbox/include/iprt/mangling.h index 5dfbac1357de..465100afad48 100644 --- a/ubuntu/vbox/include/iprt/mangling.h +++ b/ubuntu/vbox/include/iprt/mangling.h @@ -1003,6 +1003,7 @@ # define RTLdrLoadEx RT_MANGLER(RTLdrLoadEx) # define RTLdrLoadSystem RT_MANGLER(RTLdrLoadSystem) # define RTLdrOpen RT_MANGLER(RTLdrOpen) +# define RTLdrOpenEx RT_MANGLER(RTLdrOpenEx) # define RTLdrOpenInMemory RT_MANGLER(RTLdrOpenInMemory) # define RTLdrOpenkLdr RT_MANGLER(RTLdrOpenkLdr) # define RTLdrRelocate RT_MANGLER(RTLdrRelocate) @@ -2393,8 +2394,10 @@ # define RTAsn1MemAllocZ RT_MANGLER(RTAsn1MemAllocZ) # define RTAsn1MemDup RT_MANGLER(RTAsn1MemDup) # define RTAsn1MemFree RT_MANGLER(RTAsn1MemFree) -# define RTAsn1MemGrowArray RT_MANGLER(RTAsn1MemGrowArray) +# define RTAsn1MemFreeArray RT_MANGLER(RTAsn1MemFreeArray) +# define RTAsn1MemResizeArray RT_MANGLER(RTAsn1MemResizeArray) # define RTAsn1MemInitAllocation RT_MANGLER(RTAsn1MemInitAllocation) +# define RTAsn1MemInitArrayAllocation RT_MANGLER(RTAsn1MemInitArrayAllocation) # define RTAsn1SeqOfCore_Clone RT_MANGLER(RTAsn1SeqOfCore_Clone) # define RTAsn1SeqOfCore_Init RT_MANGLER(RTAsn1SeqOfCore_Init) # define RTAsn1SequenceCore_Clone RT_MANGLER(RTAsn1SequenceCore_Clone) @@ -2427,6 +2430,7 @@ # define RTAsn1CursorGetTime RT_MANGLER(RTAsn1CursorGetTime) # define RTAsn1CursorGetUtf8String RT_MANGLER(RTAsn1CursorGetUtf8String) # define RTAsn1CursorInitAllocation RT_MANGLER(RTAsn1CursorInitAllocation) +# define RTAsn1CursorInitArrayAllocation RT_MANGLER(RTAsn1CursorInitArrayAllocation) # define RTAsn1CursorInitPrimary RT_MANGLER(RTAsn1CursorInitPrimary) # define RTAsn1CursorInitSubFromCore RT_MANGLER(RTAsn1CursorInitSubFromCore) # define RTAsn1CursorIsNextEx RT_MANGLER(RTAsn1CursorIsNextEx) @@ -2436,6 +2440,7 @@ # define RTAsn1CursorSetInfo RT_MANGLER(RTAsn1CursorSetInfo) # define RTAsn1CursorSetInfoV RT_MANGLER(RTAsn1CursorSetInfoV) # define RTAsn1Dump RT_MANGLER(RTAsn1Dump) +# define RTAsn1QueryObjIdName RT_MANGLER(RTAsn1QueryObjIdName) # define RTAsn1EncodePrepare RT_MANGLER(RTAsn1EncodePrepare) # define RTAsn1EncodeRecalcHdrSize RT_MANGLER(RTAsn1EncodeRecalcHdrSize) # define RTAsn1EncodeToBuffer RT_MANGLER(RTAsn1EncodeToBuffer) @@ -2584,6 +2589,19 @@ # define RTAsn1SetOfObjIds_Delete RT_MANGLER(RTAsn1SetOfObjIds_Delete) # define RTAsn1SetOfObjIds_Enum RT_MANGLER(RTAsn1SetOfObjIds_Enum) # define RTAsn1SetOfObjIds_Init RT_MANGLER(RTAsn1SetOfObjIds_Init) +# define RTAsn1SeqOfObjIdSeqs_CheckSanity RT_MANGLER(RTAsn1SeqOfObjIdSeqs_CheckSanity) +# define RTAsn1SeqOfObjIdSeqs_Clone RT_MANGLER(RTAsn1SeqOfObjIdSeqs_Clone) +# define RTAsn1SeqOfObjIdSeqs_Compare RT_MANGLER(RTAsn1SeqOfObjIdSeqs_Compare) +# define RTAsn1SetOfObjIdSeqs_DecodeAsn1 RT_MANGLER(RTAsn1SetOfObjIdSeqs_DecodeAsn1) +# define RTAsn1SeqOfObjIdSeqs_Delete RT_MANGLER(RTAsn1SeqOfObjIdSeqs_Delete) +# define RTAsn1SeqOfObjIdSeqs_Enum RT_MANGLER(RTAsn1SeqOfObjIdSeqs_Enum) +# define RTAsn1SeqOfObjIdSeqs_Init RT_MANGLER(RTAsn1SeqOfObjIdSeqs_Init) +# define RTAsn1SetOfObjIdSeqs_CheckSanity RT_MANGLER(RTAsn1SetOfObjIdSeqs_CheckSanity) +# define RTAsn1SetOfObjIdSeqs_Clone RT_MANGLER(RTAsn1SetOfObjIdSeqs_Clone) +# define RTAsn1SetOfObjIdSeqs_Compare RT_MANGLER(RTAsn1SetOfObjIdSeqs_Compare) +# define RTAsn1SetOfObjIdSeqs_Delete RT_MANGLER(RTAsn1SetOfObjIdSeqs_Delete) +# define RTAsn1SetOfObjIdSeqs_Enum RT_MANGLER(RTAsn1SetOfObjIdSeqs_Enum) +# define RTAsn1SetOfObjIdSeqs_Init RT_MANGLER(RTAsn1SetOfObjIdSeqs_Init) # define RTAsn1ObjId_DecodeAsn1 RT_MANGLER(RTAsn1ObjId_DecodeAsn1) # define RTAsn1SeqOfObjIds_DecodeAsn1 RT_MANGLER(RTAsn1SeqOfObjIds_DecodeAsn1) # define RTAsn1SetOfObjIds_DecodeAsn1 RT_MANGLER(RTAsn1SetOfObjIds_DecodeAsn1) @@ -2770,6 +2788,8 @@ # define RTCrDigestFindByObjIdString RT_MANGLER(RTCrDigestFindByObjIdString) # define RTCrDigestFindByType RT_MANGLER(RTCrDigestFindByType) # define RTCrDigestTypeToAlgorithmOid RT_MANGLER(RTCrDigestTypeToAlgorithmOid) +# define RTCrDigestTypeToName RT_MANGLER(RTCrDigestTypeToName) +# define RTCrDigestTypeToHashSize RT_MANGLER(RTCrDigestTypeToHashSize) # define RTCrRsaDigestInfo_DecodeAsn1 RT_MANGLER(RTCrRsaDigestInfo_DecodeAsn1) # define RTCrRsaOtherPrimeInfo_DecodeAsn1 RT_MANGLER(RTCrRsaOtherPrimeInfo_DecodeAsn1) # define RTCrRsaOtherPrimeInfos_DecodeAsn1 RT_MANGLER(RTCrRsaOtherPrimeInfos_DecodeAsn1) @@ -3353,6 +3373,78 @@ # define RTErrConvertFromDarwinIO RT_MANGLER(RTErrConvertFromDarwinIO) # define RTErrConvertFromDarwinKern RT_MANGLER(RTErrConvertFromDarwinKern) +# define RTAsn1SeqOfBitStrings_Erase RT_MANGLER(RTAsn1SeqOfBitStrings_Erase) +# define RTAsn1SeqOfBitStrings_InsertEx RT_MANGLER(RTAsn1SeqOfBitStrings_InsertEx) +# define RTAsn1SeqOfBooleans_Erase RT_MANGLER(RTAsn1SeqOfBooleans_Erase) +# define RTAsn1SeqOfBooleans_InsertEx RT_MANGLER(RTAsn1SeqOfBooleans_InsertEx) +# define RTAsn1SeqOfCores_Erase RT_MANGLER(RTAsn1SeqOfCores_Erase) +# define RTAsn1SeqOfCores_InsertEx RT_MANGLER(RTAsn1SeqOfCores_InsertEx) +# define RTAsn1SeqOfIntegers_Erase RT_MANGLER(RTAsn1SeqOfIntegers_Erase) +# define RTAsn1SeqOfIntegers_InsertEx RT_MANGLER(RTAsn1SeqOfIntegers_InsertEx) +# define RTAsn1SeqOfObjIds_Erase RT_MANGLER(RTAsn1SeqOfObjIds_Erase) +# define RTAsn1SeqOfObjIds_InsertEx RT_MANGLER(RTAsn1SeqOfObjIds_InsertEx) +# define RTAsn1SeqOfOctetStrings_Erase RT_MANGLER(RTAsn1SeqOfOctetStrings_Erase) +# define RTAsn1SeqOfOctetStrings_InsertEx RT_MANGLER(RTAsn1SeqOfOctetStrings_InsertEx) +# define RTAsn1SeqOfStrings_Erase RT_MANGLER(RTAsn1SeqOfStrings_Erase) +# define RTAsn1SeqOfStrings_InsertEx RT_MANGLER(RTAsn1SeqOfStrings_InsertEx) +# define RTAsn1SeqOfTimes_Erase RT_MANGLER(RTAsn1SeqOfTimes_Erase) +# define RTAsn1SeqOfTimes_InsertEx RT_MANGLER(RTAsn1SeqOfTimes_InsertEx) +# define RTAsn1SetOfBitStrings_Erase RT_MANGLER(RTAsn1SetOfBitStrings_Erase) +# define RTAsn1SetOfBitStrings_InsertEx RT_MANGLER(RTAsn1SetOfBitStrings_InsertEx) +# define RTAsn1SetOfBooleans_Erase RT_MANGLER(RTAsn1SetOfBooleans_Erase) +# define RTAsn1SetOfBooleans_InsertEx RT_MANGLER(RTAsn1SetOfBooleans_InsertEx) +# define RTAsn1SetOfCores_Erase RT_MANGLER(RTAsn1SetOfCores_Erase) +# define RTAsn1SetOfCores_InsertEx RT_MANGLER(RTAsn1SetOfCores_InsertEx) +# define RTAsn1SetOfIntegers_Erase RT_MANGLER(RTAsn1SetOfIntegers_Erase) +# define RTAsn1SetOfIntegers_InsertEx RT_MANGLER(RTAsn1SetOfIntegers_InsertEx) +# define RTAsn1SetOfObjIds_Erase RT_MANGLER(RTAsn1SetOfObjIds_Erase) +# define RTAsn1SetOfObjIds_InsertEx RT_MANGLER(RTAsn1SetOfObjIds_InsertEx) +# define RTAsn1SetOfObjIdSeqs_Erase RT_MANGLER(RTAsn1SetOfObjIdSeqs_Erase) +# define RTAsn1SetOfObjIdSeqs_InsertEx RT_MANGLER(RTAsn1SetOfObjIdSeqs_InsertEx) +# define RTAsn1SetOfOctetStrings_Erase RT_MANGLER(RTAsn1SetOfOctetStrings_Erase) +# define RTAsn1SetOfOctetStrings_InsertEx RT_MANGLER(RTAsn1SetOfOctetStrings_InsertEx) +# define RTAsn1SetOfStrings_Erase RT_MANGLER(RTAsn1SetOfStrings_Erase) +# define RTAsn1SetOfStrings_InsertEx RT_MANGLER(RTAsn1SetOfStrings_InsertEx) +# define RTAsn1SetOfTimes_Erase RT_MANGLER(RTAsn1SetOfTimes_Erase) +# define RTAsn1SetOfTimes_InsertEx RT_MANGLER(RTAsn1SetOfTimes_InsertEx) +# define RTCrPkcs7Attributes_Erase RT_MANGLER(RTCrPkcs7Attributes_Erase) +# define RTCrPkcs7Attributes_InsertEx RT_MANGLER(RTCrPkcs7Attributes_InsertEx) +# define RTCrPkcs7SetOfCerts_Erase RT_MANGLER(RTCrPkcs7SetOfCerts_Erase) +# define RTCrPkcs7SetOfCerts_InsertEx RT_MANGLER(RTCrPkcs7SetOfCerts_InsertEx) +# define RTCrPkcs7SetOfContentInfos_Erase RT_MANGLER(RTCrPkcs7SetOfContentInfos_Erase) +# define RTCrPkcs7SetOfContentInfos_InsertEx RT_MANGLER(RTCrPkcs7SetOfContentInfos_InsertEx) +# define RTCrPkcs7SetOfSignedData_Erase RT_MANGLER(RTCrPkcs7SetOfSignedData_Erase) +# define RTCrPkcs7SetOfSignedData_InsertEx RT_MANGLER(RTCrPkcs7SetOfSignedData_InsertEx) +# define RTCrPkcs7SignerInfos_Erase RT_MANGLER(RTCrPkcs7SignerInfos_Erase) +# define RTCrPkcs7SignerInfos_InsertEx RT_MANGLER(RTCrPkcs7SignerInfos_InsertEx) +# define RTCrRsaOtherPrimeInfos_Erase RT_MANGLER(RTCrRsaOtherPrimeInfos_Erase) +# define RTCrRsaOtherPrimeInfos_InsertEx RT_MANGLER(RTCrRsaOtherPrimeInfos_InsertEx) +# define RTCrSpcSerializedObjectAttributes_Erase RT_MANGLER(RTCrSpcSerializedObjectAttributes_Erase) +# define RTCrSpcSerializedObjectAttributes_InsertEx RT_MANGLER(RTCrSpcSerializedObjectAttributes_InsertEx) +# define RTCrTafTrustAnchorList_Erase RT_MANGLER(RTCrTafTrustAnchorList_Erase) +# define RTCrTafTrustAnchorList_InsertEx RT_MANGLER(RTCrTafTrustAnchorList_InsertEx) +# define RTCrX509AlgorithmIdentifiers_Erase RT_MANGLER(RTCrX509AlgorithmIdentifiers_Erase) +# define RTCrX509AlgorithmIdentifiers_InsertEx RT_MANGLER(RTCrX509AlgorithmIdentifiers_InsertEx) +# define RTCrX509AttributeTypeAndValues_Erase RT_MANGLER(RTCrX509AttributeTypeAndValues_Erase) +# define RTCrX509AttributeTypeAndValues_InsertEx RT_MANGLER(RTCrX509AttributeTypeAndValues_InsertEx) +# define RTCrX509CertificatePolicies_Erase RT_MANGLER(RTCrX509CertificatePolicies_Erase) +# define RTCrX509CertificatePolicies_InsertEx RT_MANGLER(RTCrX509CertificatePolicies_InsertEx) +# define RTCrX509Certificates_Erase RT_MANGLER(RTCrX509Certificates_Erase) +# define RTCrX509Certificates_InsertEx RT_MANGLER(RTCrX509Certificates_InsertEx) +# define RTCrX509Extensions_Erase RT_MANGLER(RTCrX509Extensions_Erase) +# define RTCrX509Extensions_InsertEx RT_MANGLER(RTCrX509Extensions_InsertEx) +# define RTCrX509GeneralNames_Erase RT_MANGLER(RTCrX509GeneralNames_Erase) +# define RTCrX509GeneralNames_InsertEx RT_MANGLER(RTCrX509GeneralNames_InsertEx) +# define RTCrX509GeneralSubtrees_Erase RT_MANGLER(RTCrX509GeneralSubtrees_Erase) +# define RTCrX509GeneralSubtrees_InsertEx RT_MANGLER(RTCrX509GeneralSubtrees_InsertEx) +# define RTCrX509Name_Erase RT_MANGLER(RTCrX509Name_Erase) +# define RTCrX509Name_InsertEx RT_MANGLER(RTCrX509Name_InsertEx) +# define RTCrX509PolicyMappings_Erase RT_MANGLER(RTCrX509PolicyMappings_Erase) +# define RTCrX509PolicyMappings_InsertEx RT_MANGLER(RTCrX509PolicyMappings_InsertEx) +# define RTCrX509PolicyQualifierInfos_Erase RT_MANGLER(RTCrX509PolicyQualifierInfos_Erase) +# define RTCrX509PolicyQualifierInfos_InsertEx RT_MANGLER(RTCrX509PolicyQualifierInfos_InsertEx) + + /* * Stable variables (alphabetical order): */ diff --git a/ubuntu/vbox/r0drv/linux/memobj-r0drv-linux.c b/ubuntu/vbox/r0drv/linux/memobj-r0drv-linux.c index e43712d499b3..4bc2a9ba9444 100644 --- a/ubuntu/vbox/r0drv/linux/memobj-r0drv-linux.c +++ b/ubuntu/vbox/r0drv/linux/memobj-r0drv-linux.c @@ -1078,7 +1078,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P fWrite, /* force write access. */ # endif &pMemLnx->apPages[0], /* Page array. */ - papVMAs); /* vmas */ + papVMAs /* vmas */ +# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) + , NULL /* locked */ +# endif + ); #else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */ rc = get_user_pages(pTask, /* Task for fault accounting. */ pTask->mm, /* Whose pages. */ diff --git a/ubuntu/vbox/r0drv/linux/mp-r0drv-linux.c b/ubuntu/vbox/r0drv/linux/mp-r0drv-linux.c index ec2a83b46bcc..c873e4ae4e08 100644 --- a/ubuntu/vbox/r0drv/linux/mp-r0drv-linux.c +++ b/ubuntu/vbox/r0drv/linux/mp-r0drv-linux.c @@ -407,11 +407,9 @@ RTDECL(int) RTMpOnPair(RTCPUID idCpu1, RTCPUID idCpu2, uint32_t fFlags, PFNRTMPW cpu_set(idCpu2, DstCpuMask); #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) smp_call_function_many(&DstCpuMask, rtmpLinuxWrapperPostInc, &Args, !fCallSelf /* wait */); rc = 0; -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) - rc = smp_call_function_many(&DstCpuMask, rtmpLinuxWrapperPostInc, &Args, !fCallSelf /* wait */); #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) rc = smp_call_function_mask(DstCpuMask, rtmpLinuxWrapperPostInc, &Args, !fCallSelf /* wait */); #else /* older kernels */ diff --git a/ubuntu/vbox/r0drv/linux/mpnotification-r0drv-linux.c b/ubuntu/vbox/r0drv/linux/mpnotification-r0drv-linux.c index e12146c9d796..9a3a15666645 100644 --- a/ubuntu/vbox/r0drv/linux/mpnotification-r0drv-linux.c +++ b/ubuntu/vbox/r0drv/linux/mpnotification-r0drv-linux.c @@ -37,19 +37,58 @@ #include #include "r0drv/mp-r0drv.h" +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 71) && defined(CONFIG_SMP) +static enum cpuhp_state g_rtR0MpOnline; +/* + * Linux 4.10 completely removed CPU notifiers. So let's switch to CPU hotplug + * notification. + */ -/********************************************************************************************************************************* -* Internal Functions * -*********************************************************************************************************************************/ -static int rtMpNotificationLinuxCallback(struct notifier_block *pNotifierBlock, unsigned long ulNativeEvent, void *pvCpu); +static int rtR0MpNotificationLinuxOnline(unsigned int cpu) +{ + RTCPUID idCpu = RTMpCpuIdFromSetIndex(cpu); + rtMpNotificationDoCallbacks(RTMPEVENT_ONLINE, idCpu); + return 0; +} +static int rtR0MpNotificationLinuxOffline(unsigned int cpu) +{ + RTCPUID idCpu = RTMpCpuIdFromSetIndex(cpu); + rtMpNotificationDoCallbacks(RTMPEVENT_OFFLINE, idCpu); + return 0; +} + +DECLHIDDEN(int) rtR0MpNotificationNativeInit(void) +{ + int rc; + IPRT_LINUX_SAVE_EFL_AC(); + rc = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "vboxdrv:online", + rtR0MpNotificationLinuxOnline, rtR0MpNotificationLinuxOffline); + IPRT_LINUX_RESTORE_EFL_AC(); + /* + * cpuhp_setup_state_nocalls() returns a positive state number for + * CPUHP_AP_ONLINE_DYN or -ENOSPC if there is no free slot available + * (see cpuhp_reserve_state / definition of CPUHP_AP_ONLINE_DYN). + */ + AssertMsgReturn(rc > 0, ("%d\n", rc), RTErrConvertFromErrno(rc)); + g_rtR0MpOnline = rc; + return VINF_SUCCESS; +} + + +DECLHIDDEN(void) rtR0MpNotificationNativeTerm(void) +{ + IPRT_LINUX_SAVE_EFL_AC(); + cpuhp_remove_state_nocalls(g_rtR0MpOnline); + IPRT_LINUX_RESTORE_EFL_AC(); +} + +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 71) && defined(CONFIG_SMP) + +static int rtMpNotificationLinuxCallback(struct notifier_block *pNotifierBlock, unsigned long ulNativeEvent, void *pvCpu); -/********************************************************************************************************************************* -* Global Variables * -*********************************************************************************************************************************/ /** * The notifier block we use for registering the callback. */ diff --git a/ubuntu/vbox/vboxguest/product-generated.h b/ubuntu/vbox/vboxguest/product-generated.h index c1727e59d9d0..3fbe34a1fde5 100644 --- a/ubuntu/vbox/vboxguest/product-generated.h +++ b/ubuntu/vbox/vboxguest/product-generated.h @@ -5,6 +5,6 @@ #define VBOX_VENDOR_SHORT "Oracle" #define VBOX_PRODUCT "Oracle VM VirtualBox" #define VBOX_BUILD_PUBLISHER "_Ubuntu" -#define VBOX_C_YEAR "2016" +#define VBOX_C_YEAR "2017" #endif diff --git a/ubuntu/vbox/vboxguest/revision-generated.h b/ubuntu/vbox/vboxguest/revision-generated.h index 9122f3e70de1..08332bc35af6 100644 --- a/ubuntu/vbox/vboxguest/revision-generated.h +++ b/ubuntu/vbox/vboxguest/revision-generated.h @@ -1 +1 @@ -#define VBOX_SVN_REV 112026 +#define VBOX_SVN_REV 112924 diff --git a/ubuntu/vbox/vboxguest/version-generated.h b/ubuntu/vbox/vboxguest/version-generated.h index eabe4fb06ef3..9279c48c8f68 100644 --- a/ubuntu/vbox/vboxguest/version-generated.h +++ b/ubuntu/vbox/vboxguest/version-generated.h @@ -3,9 +3,9 @@ #define VBOX_VERSION_MAJOR 5 #define VBOX_VERSION_MINOR 1 -#define VBOX_VERSION_BUILD 10 -#define VBOX_VERSION_STRING_RAW "5.1.10" -#define VBOX_VERSION_STRING "5.1.10_Ubuntu" +#define VBOX_VERSION_BUILD 14 +#define VBOX_VERSION_STRING_RAW "5.1.14" +#define VBOX_VERSION_STRING "5.1.14_Ubuntu" #define VBOX_API_VERSION_STRING "5_1" #define VBOX_PRIVATE_BUILD_DESC "Private build by root" diff --git a/ubuntu/vbox/vboxsf/product-generated.h b/ubuntu/vbox/vboxsf/product-generated.h index c1727e59d9d0..3fbe34a1fde5 100644 --- a/ubuntu/vbox/vboxsf/product-generated.h +++ b/ubuntu/vbox/vboxsf/product-generated.h @@ -5,6 +5,6 @@ #define VBOX_VENDOR_SHORT "Oracle" #define VBOX_PRODUCT "Oracle VM VirtualBox" #define VBOX_BUILD_PUBLISHER "_Ubuntu" -#define VBOX_C_YEAR "2016" +#define VBOX_C_YEAR "2017" #endif diff --git a/ubuntu/vbox/vboxsf/regops.c b/ubuntu/vbox/vboxsf/regops.c index 2a9f5c4a921d..44b1f0f4db88 100644 --- a/ubuntu/vbox/vboxsf/regops.c +++ b/ubuntu/vbox/vboxsf/regops.c @@ -328,8 +328,7 @@ static int sf_reg_open(struct inode *inode, struct file *file) if (file->f_flags & O_TRUNC) { LogFunc(("O_TRUNC set\n")); - params.CreateFlags |= ( SHFL_CF_ACT_OVERWRITE_IF_EXISTS - | SHFL_CF_ACCESS_WRITE); + params.CreateFlags |= SHFL_CF_ACT_OVERWRITE_IF_EXISTS; } else params.CreateFlags |= SHFL_CF_ACT_OPEN_IF_EXISTS; @@ -340,30 +339,26 @@ static int sf_reg_open(struct inode *inode, struct file *file) if (file->f_flags & O_TRUNC) { LogFunc(("O_TRUNC set\n")); - params.CreateFlags |= ( SHFL_CF_ACT_OVERWRITE_IF_EXISTS - | SHFL_CF_ACCESS_WRITE); + params.CreateFlags |= SHFL_CF_ACT_OVERWRITE_IF_EXISTS; } } - if (!(params.CreateFlags & SHFL_CF_ACCESS_READWRITE)) + switch (file->f_flags & O_ACCMODE) { - switch (file->f_flags & O_ACCMODE) - { - case O_RDONLY: - params.CreateFlags |= SHFL_CF_ACCESS_READ; - break; + case O_RDONLY: + params.CreateFlags |= SHFL_CF_ACCESS_READ; + break; - case O_WRONLY: - params.CreateFlags |= SHFL_CF_ACCESS_WRITE; - break; + case O_WRONLY: + params.CreateFlags |= SHFL_CF_ACCESS_WRITE; + break; - case O_RDWR: - params.CreateFlags |= SHFL_CF_ACCESS_READWRITE; - break; + case O_RDWR: + params.CreateFlags |= SHFL_CF_ACCESS_READWRITE; + break; - default: - BUG (); - } + default: + BUG (); } if (file->f_flags & O_APPEND) diff --git a/ubuntu/vbox/vboxsf/revision-generated.h b/ubuntu/vbox/vboxsf/revision-generated.h index 9122f3e70de1..08332bc35af6 100644 --- a/ubuntu/vbox/vboxsf/revision-generated.h +++ b/ubuntu/vbox/vboxsf/revision-generated.h @@ -1 +1 @@ -#define VBOX_SVN_REV 112026 +#define VBOX_SVN_REV 112924 diff --git a/ubuntu/vbox/vboxsf/version-generated.h b/ubuntu/vbox/vboxsf/version-generated.h index eabe4fb06ef3..9279c48c8f68 100644 --- a/ubuntu/vbox/vboxsf/version-generated.h +++ b/ubuntu/vbox/vboxsf/version-generated.h @@ -3,9 +3,9 @@ #define VBOX_VERSION_MAJOR 5 #define VBOX_VERSION_MINOR 1 -#define VBOX_VERSION_BUILD 10 -#define VBOX_VERSION_STRING_RAW "5.1.10" -#define VBOX_VERSION_STRING "5.1.10_Ubuntu" +#define VBOX_VERSION_BUILD 14 +#define VBOX_VERSION_STRING_RAW "5.1.14" +#define VBOX_VERSION_STRING "5.1.14_Ubuntu" #define VBOX_API_VERSION_STRING "5_1" #define VBOX_PRIVATE_BUILD_DESC "Private build by root" diff --git a/ubuntu/vbox/vboxvideo/product-generated.h b/ubuntu/vbox/vboxvideo/product-generated.h index c1727e59d9d0..3fbe34a1fde5 100644 --- a/ubuntu/vbox/vboxvideo/product-generated.h +++ b/ubuntu/vbox/vboxvideo/product-generated.h @@ -5,6 +5,6 @@ #define VBOX_VENDOR_SHORT "Oracle" #define VBOX_PRODUCT "Oracle VM VirtualBox" #define VBOX_BUILD_PUBLISHER "_Ubuntu" -#define VBOX_C_YEAR "2016" +#define VBOX_C_YEAR "2017" #endif diff --git a/ubuntu/vbox/vboxvideo/revision-generated.h b/ubuntu/vbox/vboxvideo/revision-generated.h index 9122f3e70de1..08332bc35af6 100644 --- a/ubuntu/vbox/vboxvideo/revision-generated.h +++ b/ubuntu/vbox/vboxvideo/revision-generated.h @@ -1 +1 @@ -#define VBOX_SVN_REV 112026 +#define VBOX_SVN_REV 112924 diff --git a/ubuntu/vbox/vboxvideo/vbox_fb.c b/ubuntu/vbox/vboxvideo/vbox_fb.c index 93e8ba55b022..78da13624835 100644 --- a/ubuntu/vbox/vboxvideo/vbox_fb.c +++ b/ubuntu/vbox/vboxvideo/vbox_fb.c @@ -245,7 +245,6 @@ static int vboxfb_create_object(struct vbox_fbdev *fbdev, struct drm_gem_object **gobj_p) { struct drm_device *dev = fbdev->helper.dev; - u32 bpp, depth; u32 size; struct drm_gem_object *gobj; #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) @@ -256,7 +255,6 @@ static int vboxfb_create_object(struct vbox_fbdev *fbdev, int ret = 0; LogFunc(("vboxvideo: %d\n", __LINE__)); - drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp); size = pitch * mode_cmd->height; ret = vbox_gem_create(dev, size, true, &gobj); diff --git a/ubuntu/vbox/vboxvideo/version-generated.h b/ubuntu/vbox/vboxvideo/version-generated.h index eabe4fb06ef3..9279c48c8f68 100644 --- a/ubuntu/vbox/vboxvideo/version-generated.h +++ b/ubuntu/vbox/vboxvideo/version-generated.h @@ -3,9 +3,9 @@ #define VBOX_VERSION_MAJOR 5 #define VBOX_VERSION_MINOR 1 -#define VBOX_VERSION_BUILD 10 -#define VBOX_VERSION_STRING_RAW "5.1.10" -#define VBOX_VERSION_STRING "5.1.10_Ubuntu" +#define VBOX_VERSION_BUILD 14 +#define VBOX_VERSION_STRING_RAW "5.1.14" +#define VBOX_VERSION_STRING "5.1.14_Ubuntu" #define VBOX_API_VERSION_STRING "5_1" #define VBOX_PRIVATE_BUILD_DESC "Private build by root"