Commit 39297dde7390 ("x86/platform/uv: Remove UV BAU TLB Shootdown
Handler") removed uv_flush_tlb_others. Its declaration was removed also
from asm/uv/uv.h. But only for the CONFIG_X86_UV=y case. The inline
definition (!X86_UV case) is still in place.
So remove this implementation with everything what was added to support
uv_flush_tlb_others:
* include of asm/tlbflush.h
* forward declarations of struct cpumask, mm_struct, and flush_tlb_info
Signed-off-by: Jiri Slaby <[email protected]>
Cc: Mike Travis <[email protected]>
Cc: Dimitri Sivanich <[email protected]>
Cc: Steve Wahl <[email protected]>
Cc: Russ Anderson <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: [email protected]
Cc: "H. Peter Anvin" <[email protected]>
---
arch/x86/include/asm/uv/uv.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h
index 172d3e4a9e4b..648eb23fe7f0 100644
--- a/arch/x86/include/asm/uv/uv.h
+++ b/arch/x86/include/asm/uv/uv.h
@@ -2,14 +2,8 @@
#ifndef _ASM_X86_UV_UV_H
#define _ASM_X86_UV_UV_H
-#include <asm/tlbflush.h>
-
enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC};
-struct cpumask;
-struct mm_struct;
-struct flush_tlb_info;
-
#ifdef CONFIG_X86_UV
#include <linux/efi.h>
@@ -44,10 +38,6 @@ static inline int is_uv_system(void) { return 0; }
static inline int is_uv_hubbed(int uv) { return 0; }
static inline void uv_cpu_init(void) { }
static inline void uv_system_init(void) { }
-static inline const struct cpumask *
-uv_flush_tlb_others(const struct cpumask *cpumask,
- const struct flush_tlb_info *info)
-{ return cpumask; }
#endif /* X86_UV */
--
2.29.2
Thanks Jiri for catching that.
Acked-By: Mike Travis <[email protected]>
On 11/9/2020 1:36 AM, Jiri Slaby wrote:
> Commit 39297dde7390 ("x86/platform/uv: Remove UV BAU TLB Shootdown
> Handler") removed uv_flush_tlb_others. Its declaration was removed also
> from asm/uv/uv.h. But only for the CONFIG_X86_UV=y case. The inline
> definition (!X86_UV case) is still in place.
>
> So remove this implementation with everything what was added to support
> uv_flush_tlb_others:
> * include of asm/tlbflush.h
> * forward declarations of struct cpumask, mm_struct, and flush_tlb_info
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Mike Travis <[email protected]>
> Cc: Dimitri Sivanich <[email protected]>
> Cc: Steve Wahl <[email protected]>
> Cc: Russ Anderson <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Borislav Petkov <[email protected]>
> Cc: [email protected]
> Cc: "H. Peter Anvin" <[email protected]>
> ---
> arch/x86/include/asm/uv/uv.h | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h
> index 172d3e4a9e4b..648eb23fe7f0 100644
> --- a/arch/x86/include/asm/uv/uv.h
> +++ b/arch/x86/include/asm/uv/uv.h
> @@ -2,14 +2,8 @@
> #ifndef _ASM_X86_UV_UV_H
> #define _ASM_X86_UV_UV_H
>
> -#include <asm/tlbflush.h>
> -
> enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC};
>
> -struct cpumask;
> -struct mm_struct;
> -struct flush_tlb_info;
> -
> #ifdef CONFIG_X86_UV
> #include <linux/efi.h>
>
> @@ -44,10 +38,6 @@ static inline int is_uv_system(void) { return 0; }
> static inline int is_uv_hubbed(int uv) { return 0; }
> static inline void uv_cpu_init(void) { }
> static inline void uv_system_init(void) { }
> -static inline const struct cpumask *
> -uv_flush_tlb_others(const struct cpumask *cpumask,
> - const struct flush_tlb_info *info)
> -{ return cpumask; }
>
> #endif /* X86_UV */
>
>
Acked-by: Steve Wahl <[email protected]>
On Mon, Nov 09, 2020 at 10:36:53AM +0100, Jiri Slaby wrote:
> Commit 39297dde7390 ("x86/platform/uv: Remove UV BAU TLB Shootdown
> Handler") removed uv_flush_tlb_others. Its declaration was removed also
> from asm/uv/uv.h. But only for the CONFIG_X86_UV=y case. The inline
> definition (!X86_UV case) is still in place.
>
> So remove this implementation with everything what was added to support
> uv_flush_tlb_others:
> * include of asm/tlbflush.h
> * forward declarations of struct cpumask, mm_struct, and flush_tlb_info
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Mike Travis <[email protected]>
> Cc: Dimitri Sivanich <[email protected]>
> Cc: Steve Wahl <[email protected]>
> Cc: Russ Anderson <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Borislav Petkov <[email protected]>
> Cc: [email protected]
> Cc: "H. Peter Anvin" <[email protected]>
> ---
> arch/x86/include/asm/uv/uv.h | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h
> index 172d3e4a9e4b..648eb23fe7f0 100644
> --- a/arch/x86/include/asm/uv/uv.h
> +++ b/arch/x86/include/asm/uv/uv.h
> @@ -2,14 +2,8 @@
> #ifndef _ASM_X86_UV_UV_H
> #define _ASM_X86_UV_UV_H
>
> -#include <asm/tlbflush.h>
> -
> enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC};
>
> -struct cpumask;
> -struct mm_struct;
> -struct flush_tlb_info;
> -
> #ifdef CONFIG_X86_UV
> #include <linux/efi.h>
>
> @@ -44,10 +38,6 @@ static inline int is_uv_system(void) { return 0; }
> static inline int is_uv_hubbed(int uv) { return 0; }
> static inline void uv_cpu_init(void) { }
> static inline void uv_system_init(void) { }
> -static inline const struct cpumask *
> -uv_flush_tlb_others(const struct cpumask *cpumask,
> - const struct flush_tlb_info *info)
> -{ return cpumask; }
>
> #endif /* X86_UV */
>
> --
> 2.29.2
>
--
Steve Wahl, Hewlett Packard Enterprise
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: b2896458b850ec7cb69b054b195b4b399f7e1f22
Gitweb: https://git.kernel.org/tip/b2896458b850ec7cb69b054b195b4b399f7e1f22
Author: Jiri Slaby <[email protected]>
AuthorDate: Mon, 09 Nov 2020 10:36:53 +01:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Wed, 11 Nov 2020 13:16:51 +01:00
x86/platform/uv: Drop last traces of uv_flush_tlb_others
Commit 39297dde7390 ("x86/platform/uv: Remove UV BAU TLB Shootdown
Handler") removed uv_flush_tlb_others. Its declaration was removed also
from asm/uv/uv.h. But only for the CONFIG_X86_UV=y case. The inline
definition (!X86_UV case) is still in place.
So remove this implementation with everything what was added to support
uv_flush_tlb_others:
* include of asm/tlbflush.h
* forward declarations of struct cpumask, mm_struct, and flush_tlb_info
Signed-off-by: Jiri Slaby <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Acked-by: Mike Travis <[email protected]>
Acked-by: Steve Wahl <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/include/asm/uv/uv.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h
index 172d3e4..648eb23 100644
--- a/arch/x86/include/asm/uv/uv.h
+++ b/arch/x86/include/asm/uv/uv.h
@@ -2,14 +2,8 @@
#ifndef _ASM_X86_UV_UV_H
#define _ASM_X86_UV_UV_H
-#include <asm/tlbflush.h>
-
enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC};
-struct cpumask;
-struct mm_struct;
-struct flush_tlb_info;
-
#ifdef CONFIG_X86_UV
#include <linux/efi.h>
@@ -44,10 +38,6 @@ static inline int is_uv_system(void) { return 0; }
static inline int is_uv_hubbed(int uv) { return 0; }
static inline void uv_cpu_init(void) { }
static inline void uv_system_init(void) { }
-static inline const struct cpumask *
-uv_flush_tlb_others(const struct cpumask *cpumask,
- const struct flush_tlb_info *info)
-{ return cpumask; }
#endif /* X86_UV */