From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Apr 2023 16:22:30 +0000 (-0700)
Subject: Merge tag 'x86_cleanups_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6-pxa1908~1347
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=682f7bbad29c0e5f59929ad69e1ed8525feb96d3;p=linux.git

Merge tag 'x86_cleanups_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Borislav Petkov:

 - Unify duplicated __pa() and __va() definitions

 - Simplify sysctl tables registration

 - Remove unused symbols

 - Correct function name in comment

* tag 'x86_cleanups_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Centralize __pa()/__va() definitions
  x86: Simplify one-level sysctl registration for itmt_kern_table
  x86: Simplify one-level sysctl registration for abi_table2
  x86/platform/intel-mid: Remove unused definitions from intel-mid.h
  x86/uaccess: Remove memcpy_page_flushcache()
  x86/entry: Change stale function name in comment to error_return()
---

682f7bbad29c0e5f59929ad69e1ed8525feb96d3
diff --cc arch/x86/include/asm/uaccess_64.h
index 0a49a8de9f3c,c6b1dcded364..c972bd21aa23
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@@ -52,10 -58,10 +52,8 @@@ raw_copy_to_user(void __user *dst, cons
  	return copy_user_generic((__force void *)dst, src, size);
  }
  
 -extern long __copy_user_nocache(void *dst, const void __user *src,
 -				unsigned size, int zerorest);
 -
 +extern long __copy_user_nocache(void *dst, const void __user *src, unsigned size);
  extern long __copy_user_flushcache(void *dst, const void __user *src, unsigned size);
- extern void memcpy_page_flushcache(char *to, struct page *page, size_t offset,
- 			   size_t len);
  
  static inline int
  __copy_from_user_inatomic_nocache(void *dst, const void __user *src,