diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 5fd3fe7f741ef8cbc3edc1ad6fff217e3866f63b..f9ac17a4d3682a08e7f74f0fd2fde8a7dd302647 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 6ca64b3f32f3f31f88fb6b1f55c7d890197011a0..677ee7013332efe8a7df65c9f92400eafd729986 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 55ae913ccf0101b427dd665a613b4eb4251d1232..cbd67b316a84070ebf017cd0b57d5c3dd902a023 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 308fe936638cf82c2576a55aedbb66de981e93c1..73e19811268d9d1966fcd31740ff4748465af200 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 ca4d2fc5d326532f46f0747f99065d8350735a80..d427114bd8bab3a93a522cedd66aded1ed042109 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,