aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/io.h4
-rw-r--r--include/asm-generic/kvm_para.h5
-rw-r--r--include/asm-generic/pgtable.h4
-rw-r--r--include/asm-generic/tlb.h17
-rw-r--r--include/asm-generic/vmlinux.lds.h20
5 files changed, 14 insertions, 36 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index ac9da00e9f2c..d5afe96adba6 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -343,8 +343,12 @@ extern void ioport_unmap(void __iomem *p);
343#endif /* CONFIG_GENERIC_IOMAP */ 343#endif /* CONFIG_GENERIC_IOMAP */
344#endif /* CONFIG_HAS_IOPORT */ 344#endif /* CONFIG_HAS_IOPORT */
345 345
346#ifndef xlate_dev_kmem_ptr
346#define xlate_dev_kmem_ptr(p) p 347#define xlate_dev_kmem_ptr(p) p
348#endif
349#ifndef xlate_dev_mem_ptr
347#define xlate_dev_mem_ptr(p) __va(p) 350#define xlate_dev_mem_ptr(p) __va(p)
351#endif
348 352
349#ifdef CONFIG_VIRT_TO_BUS 353#ifdef CONFIG_VIRT_TO_BUS
350#ifndef virt_to_bus 354#ifndef virt_to_bus
diff --git a/include/asm-generic/kvm_para.h b/include/asm-generic/kvm_para.h
index 9d96605f160a..fa25becbdcaf 100644
--- a/include/asm-generic/kvm_para.h
+++ b/include/asm-generic/kvm_para.h
@@ -18,4 +18,9 @@ static inline unsigned int kvm_arch_para_features(void)
18 return 0; 18 return 0;
19} 19}
20 20
21static inline bool kvm_para_available(void)
22{
23 return false;
24}
25
21#endif 26#endif
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index a59ff51b0166..b1836987d506 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -692,4 +692,8 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
692 692
693#endif /* !__ASSEMBLY__ */ 693#endif /* !__ASSEMBLY__ */
694 694
695#ifndef io_remap_pfn_range
696#define io_remap_pfn_range remap_pfn_range
697#endif
698
695#endif /* _ASM_GENERIC_PGTABLE_H */ 699#endif /* _ASM_GENERIC_PGTABLE_H */
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index b1b1fa6ffffe..13821c339a41 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -97,11 +97,9 @@ struct mmu_gather {
97 unsigned long start; 97 unsigned long start;
98 unsigned long end; 98 unsigned long end;
99 unsigned int need_flush : 1, /* Did free PTEs */ 99 unsigned int need_flush : 1, /* Did free PTEs */
100 fast_mode : 1; /* No batching */
101
102 /* we are in the middle of an operation to clear 100 /* we are in the middle of an operation to clear
103 * a full mm and can make some optimizations */ 101 * a full mm and can make some optimizations */
104 unsigned int fullmm : 1, 102 fullmm : 1,
105 /* we have performed an operation which 103 /* we have performed an operation which
106 * requires a complete flush of the tlb */ 104 * requires a complete flush of the tlb */
107 need_flush_all : 1; 105 need_flush_all : 1;
@@ -114,19 +112,6 @@ struct mmu_gather {
114 112
115#define HAVE_GENERIC_MMU_GATHER 113#define HAVE_GENERIC_MMU_GATHER
116 114
117static inline int tlb_fast_mode(struct mmu_gather *tlb)
118{
119#ifdef CONFIG_SMP
120 return tlb->fast_mode;
121#else
122 /*
123 * For UP we don't need to worry about TLB flush
124 * and page free order so much..
125 */
126 return 1;
127#endif
128}
129
130void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, bool fullmm); 115void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, bool fullmm);
131void tlb_flush_mmu(struct mmu_gather *tlb); 116void tlb_flush_mmu(struct mmu_gather *tlb);
132void tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, 117void tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start,
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index eb58d2d7d971..4f2737208c42 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -68,14 +68,6 @@
68 * are handled as text/data or they can be discarded (which 68 * are handled as text/data or they can be discarded (which
69 * often happens at runtime) 69 * often happens at runtime)
70 */ 70 */
71#ifdef CONFIG_HOTPLUG
72#define DEV_KEEP(sec) *(.dev##sec)
73#define DEV_DISCARD(sec)
74#else
75#define DEV_KEEP(sec)
76#define DEV_DISCARD(sec) *(.dev##sec)
77#endif
78
79#ifdef CONFIG_HOTPLUG_CPU 71#ifdef CONFIG_HOTPLUG_CPU
80#define CPU_KEEP(sec) *(.cpu##sec) 72#define CPU_KEEP(sec) *(.cpu##sec)
81#define CPU_DISCARD(sec) 73#define CPU_DISCARD(sec)
@@ -182,8 +174,6 @@
182 *(.data) \ 174 *(.data) \
183 *(.ref.data) \ 175 *(.ref.data) \
184 *(.data..shared_aligned) /* percpu related */ \ 176 *(.data..shared_aligned) /* percpu related */ \
185 DEV_KEEP(init.data) \
186 DEV_KEEP(exit.data) \
187 CPU_KEEP(init.data) \ 177 CPU_KEEP(init.data) \
188 CPU_KEEP(exit.data) \ 178 CPU_KEEP(exit.data) \
189 MEM_KEEP(init.data) \ 179 MEM_KEEP(init.data) \
@@ -372,8 +362,6 @@
372 /* __*init sections */ \ 362 /* __*init sections */ \
373 __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \ 363 __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \
374 *(.ref.rodata) \ 364 *(.ref.rodata) \
375 DEV_KEEP(init.rodata) \
376 DEV_KEEP(exit.rodata) \
377 CPU_KEEP(init.rodata) \ 365 CPU_KEEP(init.rodata) \
378 CPU_KEEP(exit.rodata) \ 366 CPU_KEEP(exit.rodata) \
379 MEM_KEEP(init.rodata) \ 367 MEM_KEEP(init.rodata) \
@@ -416,8 +404,6 @@
416 *(.text.hot) \ 404 *(.text.hot) \
417 *(.text) \ 405 *(.text) \
418 *(.ref.text) \ 406 *(.ref.text) \
419 DEV_KEEP(init.text) \
420 DEV_KEEP(exit.text) \
421 CPU_KEEP(init.text) \ 407 CPU_KEEP(init.text) \
422 CPU_KEEP(exit.text) \ 408 CPU_KEEP(exit.text) \
423 MEM_KEEP(init.text) \ 409 MEM_KEEP(init.text) \
@@ -503,7 +489,6 @@
503/* init and exit section handling */ 489/* init and exit section handling */
504#define INIT_DATA \ 490#define INIT_DATA \
505 *(.init.data) \ 491 *(.init.data) \
506 DEV_DISCARD(init.data) \
507 CPU_DISCARD(init.data) \ 492 CPU_DISCARD(init.data) \
508 MEM_DISCARD(init.data) \ 493 MEM_DISCARD(init.data) \
509 KERNEL_CTORS() \ 494 KERNEL_CTORS() \
@@ -511,7 +496,6 @@
511 *(.init.rodata) \ 496 *(.init.rodata) \
512 FTRACE_EVENTS() \ 497 FTRACE_EVENTS() \
513 TRACE_SYSCALLS() \ 498 TRACE_SYSCALLS() \
514 DEV_DISCARD(init.rodata) \
515 CPU_DISCARD(init.rodata) \ 499 CPU_DISCARD(init.rodata) \
516 MEM_DISCARD(init.rodata) \ 500 MEM_DISCARD(init.rodata) \
517 CLK_OF_TABLES() \ 501 CLK_OF_TABLES() \
@@ -521,14 +505,11 @@
521 505
522#define INIT_TEXT \ 506#define INIT_TEXT \
523 *(.init.text) \ 507 *(.init.text) \
524 DEV_DISCARD(init.text) \
525 CPU_DISCARD(init.text) \ 508 CPU_DISCARD(init.text) \
526 MEM_DISCARD(init.text) 509 MEM_DISCARD(init.text)
527 510
528#define EXIT_DATA \ 511#define EXIT_DATA \
529 *(.exit.data) \ 512 *(.exit.data) \
530 DEV_DISCARD(exit.data) \
531 DEV_DISCARD(exit.rodata) \
532 CPU_DISCARD(exit.data) \ 513 CPU_DISCARD(exit.data) \
533 CPU_DISCARD(exit.rodata) \ 514 CPU_DISCARD(exit.rodata) \
534 MEM_DISCARD(exit.data) \ 515 MEM_DISCARD(exit.data) \
@@ -536,7 +517,6 @@
536 517
537#define EXIT_TEXT \ 518#define EXIT_TEXT \
538 *(.exit.text) \ 519 *(.exit.text) \
539 DEV_DISCARD(exit.text) \
540 CPU_DISCARD(exit.text) \ 520 CPU_DISCARD(exit.text) \
541 MEM_DISCARD(exit.text) 521 MEM_DISCARD(exit.text)
542 522
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-28 06:42:24 -0500