From 798f2efd187da660d815068c219ac77e18ba30fd Mon Sep 17 00:00:00 2001 From: Lijun Fang Date: Fri, 15 Nov 2019 19:55:46 +0800 Subject: [PATCH] configs: Delete CONFIG_ARCH_ASCEND for versatility code ascend inclusion category: feature bugzilla: NA CVE: NA -------- Delete CONFIG_ARCH_ASCEND for versatility code Signed-off-by: Lijun Fang Reviewed-by: Kefeng Wang Reviewed-by: Wenan Mao Signed-off-by: Yang Yingliang --- include/linux/hugetlb.h | 2 +- include/net/ip.h | 4 ---- mm/hugetlb.c | 4 +--- net/ipv4/icmp.c | 5 ++--- net/ipv4/sysctl_net_ipv4.c | 2 -- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 5fd3fe7f741e..f9ac17a4d368 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -372,7 +372,7 @@ struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, int huge_add_to_page_cache(struct page *page, struct address_space *mapping, pgoff_t idx); -#ifdef CONFIG_ARCH_ASCEND +#ifdef CONFIG_ARM64 const struct hstate *hugetlb_get_hstate(void); struct page *hugetlb_alloc_hugepage(int nid); int hugetlb_insert_hugepage_pte(struct mm_struct *mm, unsigned long addr, diff --git a/include/net/ip.h b/include/net/ip.h index 6ca64b3f32f3..677ee7013332 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -685,11 +685,7 @@ bool icmp_global_allow(void); extern int sysctl_icmp_msgs_per_sec; extern int sysctl_icmp_msgs_burst; -#ifdef CONFIG_ARCH_ASCEND extern int sysctl_icmp_timestamp_enable; -#else -#define sysctl_icmp_timestamp_enable 1 -#endif #ifdef CONFIG_PROC_FS int ip_misc_proc_init(void); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 55ae913ccf01..cbd67b316a84 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5123,8 +5123,7 @@ void move_hugetlb_state(struct page *oldpage, struct page *newpage, int reason) } } -#ifdef CONFIG_ARCH_ASCEND - +#ifdef CONFIG_ARM64 const struct hstate *hugetlb_get_hstate(void) { return &default_hstate; @@ -5224,5 +5223,4 @@ int hugetlb_insert_hugepage_pte_by_pa(struct mm_struct *mm, return 0; } EXPORT_SYMBOL_GPL(hugetlb_insert_hugepage_pte_by_pa); - #endif diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 308fe936638c..73e19811268d 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -232,9 +232,8 @@ static inline void icmp_xmit_unlock(struct sock *sk) int sysctl_icmp_msgs_per_sec __read_mostly = 1000; int sysctl_icmp_msgs_burst __read_mostly = 50; -#ifdef CONFIG_ARCH_ASCEND -int sysctl_icmp_timestamp_enable __read_mostly; -#endif + +int sysctl_icmp_timestamp_enable __read_mostly = 1; static struct { spinlock_t lock; diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index ca4d2fc5d326..d427114bd8ba 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -545,7 +545,6 @@ static struct ctl_table ipv4_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = &zero, }, -#ifdef CONFIG_ARCH_ASCEND { .procname = "icmp_timestamp_enable", .data = &sysctl_icmp_timestamp_enable, @@ -554,7 +553,6 @@ static struct ctl_table ipv4_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = &zero, }, -#endif { .procname = "udp_mem", .data = &sysctl_udp_mem, -- GitLab