diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 12:25:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 12:25:15 -0400 |
commit | 57e88b43b81301d9b28f124a5576ac43a1cf9e8d (patch) | |
tree | 4f8be8cab8afe07dbb4b8469bf6f873f4372b396 /include/linux/hyperv.h | |
parent | 3b9f8ed25dbe5f858b1331588929f2a766aef55f (diff) | |
parent | 773b79f7a7c7839fb9d09c0e206734173a8b0a6b (diff) |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"The main changes include various Hyper-V optimizations such as faster
hypercalls and faster/better TLB flushes - and there's also some
Intel-MID cleanups"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tracing/hyper-v: Trace hyperv_mmu_flush_tlb_others()
x86/hyper-v: Support extended CPU ranges for TLB flush hypercalls
x86/platform/intel-mid: Make several arrays static, to make code smaller
MAINTAINERS: Add missed file for Hyper-V
x86/hyper-v: Use hypercall for remote TLB flush
hyper-v: Globalize vp_index
x86/hyper-v: Implement rep hypercalls
hyper-v: Use fast hypercall for HVCALL_SIGNAL_EVENT
x86/hyper-v: Introduce fast hypercall implementation
x86/hyper-v: Make hv_do_hypercall() inline
x86/hyper-v: Include hyperv/ only when CONFIG_HYPERV is set
x86/platform/intel-mid: Make 'bt_sfi_data' const
x86/platform/intel-mid: Make IRQ allocation a bit more flexible
x86/platform/intel-mid: Group timers callbacks together
Diffstat (limited to 'include/linux/hyperv.h')
-rw-r--r-- | include/linux/hyperv.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index e4bbf7dc9932..c458d7b7ad19 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h | |||
@@ -661,18 +661,6 @@ union hv_connection_id { | |||
661 | } u; | 661 | } u; |
662 | }; | 662 | }; |
663 | 663 | ||
664 | /* Definition of the hv_signal_event hypercall input structure. */ | ||
665 | struct hv_input_signal_event { | ||
666 | union hv_connection_id connectionid; | ||
667 | u16 flag_number; | ||
668 | u16 rsvdz; | ||
669 | }; | ||
670 | |||
671 | struct hv_input_signal_event_buffer { | ||
672 | u64 align8; | ||
673 | struct hv_input_signal_event event; | ||
674 | }; | ||
675 | |||
676 | enum hv_numa_policy { | 664 | enum hv_numa_policy { |
677 | HV_BALANCED = 0, | 665 | HV_BALANCED = 0, |
678 | HV_LOCALIZED, | 666 | HV_LOCALIZED, |
@@ -754,8 +742,7 @@ struct vmbus_channel { | |||
754 | } callback_mode; | 742 | } callback_mode; |
755 | 743 | ||
756 | bool is_dedicated_interrupt; | 744 | bool is_dedicated_interrupt; |
757 | struct hv_input_signal_event_buffer sig_buf; | 745 | u64 sig_event; |
758 | struct hv_input_signal_event *sig_event; | ||
759 | 746 | ||
760 | /* | 747 | /* |
761 | * Starting with win8, this field will be used to specify | 748 | * Starting with win8, this field will be used to specify |
@@ -1151,8 +1138,6 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, | |||
1151 | resource_size_t size, resource_size_t align, | 1138 | resource_size_t size, resource_size_t align, |
1152 | bool fb_overlap_ok); | 1139 | bool fb_overlap_ok); |
1153 | void vmbus_free_mmio(resource_size_t start, resource_size_t size); | 1140 | void vmbus_free_mmio(resource_size_t start, resource_size_t size); |
1154 | int vmbus_cpu_number_to_vp_number(int cpu_number); | ||
1155 | u64 hv_do_hypercall(u64 control, void *input, void *output); | ||
1156 | 1141 | ||
1157 | /* | 1142 | /* |
1158 | * GUID definitions of various offer types - services offered to the guest. | 1143 | * GUID definitions of various offer types - services offered to the guest. |