Commit 682f7bba authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 33afd4b7 5462ade6
...@@ -8,14 +8,6 @@ ...@@ -8,14 +8,6 @@
* Copyright (C) 2016 Kees Cook * Copyright (C) 2016 Kees Cook
*/ */
/*
* Since we're dealing with identity mappings, physical and virtual
* addresses are the same, so override these defines which are ultimately
* used by the headers in misc.h.
*/
#define __pa(x) ((unsigned long)(x))
#define __va(x) ((void *)((unsigned long)(x)))
/* No PAGE_TABLE_ISOLATION support needed either: */ /* No PAGE_TABLE_ISOLATION support needed either: */
#undef CONFIG_PAGE_TABLE_ISOLATION #undef CONFIG_PAGE_TABLE_ISOLATION
......
...@@ -19,6 +19,15 @@ ...@@ -19,6 +19,15 @@
/* cpu_feature_enabled() cannot be used this early */ /* cpu_feature_enabled() cannot be used this early */
#define USE_EARLY_PGTABLE_L5 #define USE_EARLY_PGTABLE_L5
/*
* Boot stub deals with identity mappings, physical and virtual addresses are
* the same, so override these defines.
*
* <asm/page.h> will not define them if they are already defined.
*/
#define __pa(x) ((unsigned long)(x))
#define __va(x) ((void *)((unsigned long)(x)))
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/screen_info.h> #include <linux/screen_info.h>
#include <linux/elf.h> #include <linux/elf.h>
......
...@@ -104,9 +104,7 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt, ...@@ -104,9 +104,7 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,
} }
#undef __init #undef __init
#undef __pa
#define __init #define __init
#define __pa(x) ((unsigned long)(x))
#define __BOOT_COMPRESSED #define __BOOT_COMPRESSED
......
...@@ -1027,7 +1027,7 @@ SYM_CODE_START_LOCAL(paranoid_exit) ...@@ -1027,7 +1027,7 @@ SYM_CODE_START_LOCAL(paranoid_exit)
* *
* NB to anyone to try to optimize this code: this code does * NB to anyone to try to optimize this code: this code does
* not execute at all for exceptions from user mode. Those * not execute at all for exceptions from user mode. Those
* exceptions go through error_exit instead. * exceptions go through error_return instead.
*/ */
RESTORE_CR3 scratch_reg=%rax save_reg=%r14 RESTORE_CR3 scratch_reg=%rax save_reg=%r14
......
...@@ -70,18 +70,9 @@ static struct ctl_table abi_table2[] = { ...@@ -70,18 +70,9 @@ static struct ctl_table abi_table2[] = {
{} {}
}; };
static struct ctl_table abi_root_table2[] = {
{
.procname = "abi",
.mode = 0555,
.child = abi_table2
},
{}
};
static __init int ia32_binfmt_init(void) static __init int ia32_binfmt_init(void)
{ {
register_sysctl_table(abi_root_table2); register_sysctl("abi", abi_table2);
return 0; return 0;
} }
__initcall(ia32_binfmt_init); __initcall(ia32_binfmt_init);
......
...@@ -20,25 +20,4 @@ extern void intel_mid_pwr_power_off(void); ...@@ -20,25 +20,4 @@ extern void intel_mid_pwr_power_off(void);
extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev); extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev);
#ifdef CONFIG_X86_INTEL_MID
extern void intel_scu_devices_create(void);
extern void intel_scu_devices_destroy(void);
#else /* !CONFIG_X86_INTEL_MID */
static inline void intel_scu_devices_create(void) { }
static inline void intel_scu_devices_destroy(void) { }
#endif /* !CONFIG_X86_INTEL_MID */
/* Bus Select SoC Fuse value */
#define BSEL_SOC_FUSE_MASK 0x7
/* FSB 133MHz */
#define BSEL_SOC_FUSE_001 0x1
/* FSB 100MHz */
#define BSEL_SOC_FUSE_101 0x5
/* FSB 83MHz */
#define BSEL_SOC_FUSE_111 0x7
#endif /* _ASM_X86_INTEL_MID_H */ #endif /* _ASM_X86_INTEL_MID_H */
...@@ -54,8 +54,6 @@ raw_copy_to_user(void __user *dst, const void *src, unsigned long size) ...@@ -54,8 +54,6 @@ raw_copy_to_user(void __user *dst, const void *src, unsigned long size)
extern long __copy_user_nocache(void *dst, const void __user *src, unsigned size); 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 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 static inline int
__copy_from_user_inatomic_nocache(void *dst, const void __user *src, __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
......
...@@ -77,15 +77,6 @@ static struct ctl_table itmt_kern_table[] = { ...@@ -77,15 +77,6 @@ static struct ctl_table itmt_kern_table[] = {
{} {}
}; };
static struct ctl_table itmt_root_table[] = {
{
.procname = "kernel",
.mode = 0555,
.child = itmt_kern_table,
},
{}
};
static struct ctl_table_header *itmt_sysctl_header; static struct ctl_table_header *itmt_sysctl_header;
/** /**
...@@ -114,7 +105,7 @@ int sched_set_itmt_support(void) ...@@ -114,7 +105,7 @@ int sched_set_itmt_support(void)
return 0; return 0;
} }
itmt_sysctl_header = register_sysctl_table(itmt_root_table); itmt_sysctl_header = register_sysctl("kernel", itmt_kern_table);
if (!itmt_sysctl_header) { if (!itmt_sysctl_header) {
mutex_unlock(&itmt_update_mutex); mutex_unlock(&itmt_update_mutex);
return -ENOMEM; return -ENOMEM;
......
...@@ -140,13 +140,4 @@ void __memcpy_flushcache(void *_dst, const void *_src, size_t size) ...@@ -140,13 +140,4 @@ void __memcpy_flushcache(void *_dst, const void *_src, size_t size)
} }
} }
EXPORT_SYMBOL_GPL(__memcpy_flushcache); EXPORT_SYMBOL_GPL(__memcpy_flushcache);
void memcpy_page_flushcache(char *to, struct page *page, size_t offset,
size_t len)
{
char *from = kmap_atomic(page);
memcpy_flushcache(to, from + offset, len);
kunmap_atomic(from);
}
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment