Commit 19300488 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cleanups_for_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Dave Hansen:
 "As usual, these are all over the map. The biggest cluster is work from
  Arnd to eliminate -Wmissing-prototype warnings:

   - Address -Wmissing-prototype warnings

   - Remove repeated 'the' in comments

   - Remove unused current_untag_mask()

   - Document urgent tip branch timing

   - Clean up MSR kernel-doc notation

   - Clean up paravirt_ops doc

   - Update Srivatsa S. Bhat's maintained areas

   - Remove unused extern declaration acpi_copy_wakeup_routine()"

* tag 'x86_cleanups_for_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  x86/acpi: Remove unused extern declaration acpi_copy_wakeup_routine()
  Documentation: virt: Clean up paravirt_ops doc
  x86/mm: Remove unused current_untag_mask()
  x86/mm: Remove repeated word in comments
  x86/lib/msr: Clean up kernel-doc notation
  x86/platform: Avoid missing-prototype warnings for OLPC
  x86/mm: Add early_memremap_pgprot_adjust() prototype
  x86/usercopy: Include arch_wb_cache_pmem() declaration
  x86/vdso: Include vdso/processor.h
  x86/mce: Add copy_mc_fragile_handle_tail() prototype
  x86/fbdev: Include asm/fb.h as needed
  x86/hibernate: Declare global functions in suspend.h
  x86/entry: Add do_SYSENTER_32() prototype
  x86/quirks: Include linux/pnp.h for arch_pnpbios_disabled()
  x86/mm: Include asm/numa.h for set_highmem_pages_init()
  x86: Avoid missing-prototype warnings for doublefault code
  x86/fpu: Include asm/fpu/regset.h
  x86: Add dummy prototype for mk_early_pgtbl_32()
  x86/pci: Mark local functions as 'static'
  x86/ftrace: Move prepare_ftrace_return prototype to header
  ...
parents 5dfe7a7e b360cbd2

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -383,6 +383,12 @@ E: tomas@nocrew.org 
W: http://tomas.nocrew.org/

D: dsp56k device driver



N: Srivatsa S. Bhat

E: srivatsa@csail.mit.edu

D: Maintainer of Generic Paravirt-Ops subsystem

D: Maintainer of VMware hypervisor interface

D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)



N: Ross Biro

E: ross.biro@gmail.com

D: Original author of the Linux networking code

Documentation/process/maintainer-tip.rst

+3 −0
Original line number Diff line number Diff line
@@ -421,6 +421,9 @@ allowing themselves a breath. Please respect that. 
The release candidate -rc1 is the starting point for new patches to be

applied which are targeted for the next merge window.



So called _urgent_ branches will be merged into mainline during the

stabilization phase of each release.





Git

^^^

Documentation/virt/paravirt_ops.rst

+8 −8
Original line number Diff line number Diff line
@@ -5,31 +5,31 @@ Paravirt_ops 
============



Linux provides support for different hypervisor virtualization technologies.

Historically different binary kernels would be required in order to support

different hypervisors, this restriction was removed with pv_ops.

Historically, different binary kernels would be required in order to support

different hypervisors; this restriction was removed with pv_ops.

Linux pv_ops is a virtualization API which enables support for different

hypervisors. It allows each hypervisor to override critical operations and

allows a single kernel binary to run on all supported execution environments

including native machine -- without any hypervisors.



pv_ops provides a set of function pointers which represent operations

corresponding to low level critical instructions and high level

functionalities in various areas. pv-ops allows for optimizations at run

time by enabling binary patching of the low-ops critical operations

corresponding to low-level critical instructions and high-level

functionalities in various areas. pv_ops allows for optimizations at run

time by enabling binary patching of the low-level critical operations

at boot time.



pv_ops operations are classified into three categories:



- simple indirect call

   These operations correspond to high level functionality where it is

   These operations correspond to high-level functionality where it is

   known that the overhead of indirect call isn't very important.



- indirect call which allows optimization with binary patch

   Usually these operations correspond to low level critical instructions. They

   Usually these operations correspond to low-level critical instructions. They

   are called frequently and are performance critical. The overhead is

   very important.



- a set of macros for hand written assembly code

   Hand written assembly codes (.S files) also need paravirtualization

   because they include sensitive instructions or some of code paths in

   because they include sensitive instructions or some code paths in

   them are very performance critical.

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -15974,7 +15974,7 @@ F: include/uapi/linux/ppdev.h 








PARAVIRT_OPS INTERFACE









M:	Juergen Gross <jgross@suse.com>









M:	Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>









R:	Ajay Kaher <akaher@vmware.com>









R:	Alexey Makhalov <amakhalov@vmware.com>









R:	VMware PV-Drivers Reviewers <pv-drivers@vmware.com>









L:	virtualization@lists.linux-foundation.org








@@ -22546,7 +22546,7 @@ S:	Supported







F:	drivers/misc/vmw_balloon.c

















VMWARE HYPERVISOR INTERFACE









M:	Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>









M:	Ajay Kaher <akaher@vmware.com>









M:	Alexey Makhalov <amakhalov@vmware.com>









R:	VMware PV-Drivers Reviewers <pv-drivers@vmware.com>









L:	virtualization@lists.linux-foundation.org








@@ -22573,8 +22573,8 @@ F:	drivers/scsi/vmw_pvscsi.c







F:	drivers/scsi/vmw_pvscsi.h

















VMWARE VIRTUAL PTP CLOCK DRIVER









M:	Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>









M:	Deep Shah <sdeep@vmware.com>









R:	Ajay Kaher <akaher@vmware.com>









R:	Alexey Makhalov <amakhalov@vmware.com>









R:	VMware PV-Drivers Reviewers <pv-drivers@vmware.com>









L:	netdev@vger.kernel.org

























arch/x86/entry/vdso/vgetcpu.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@







#include <linux/kernel.h>









#include <linux/getcpu.h>









#include <asm/segment.h>









#include <vdso/processor.h>



















notrace long









__vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)