diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-12 04:04:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 14:32:04 -0400 |
commit | 37743487704322e0d5bbf7e003d28c143fcc2a2b (patch) | |
tree | 3a51d9af42a26342be29fe9744af020f1da70a78 | |
parent | 34d4accfe0ed62d3a8e3dc28eec193d6085f9563 (diff) |
sparc32: drop btfixup for check_pgt_cache
It is a noop for srmmu - so use a define as sparc64 does.
And drop all sparc callers - no need to confuse our-self
be calling a noop function.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/include/asm/pgalloc_32.h | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/process_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/init_32.c | 16 | ||||
-rw-r--r-- | arch/sparc/mm/srmmu.c | 6 |
4 files changed, 1 insertions, 27 deletions
diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h index ca2b34456c4b..d7ec897eae5b 100644 --- a/arch/sparc/include/asm/pgalloc_32.h +++ b/arch/sparc/include/asm/pgalloc_32.h | |||
@@ -21,9 +21,7 @@ extern struct pgtable_cache_struct { | |||
21 | #define pgtable_cache_size (pgt_quicklists.pgtable_cache_sz) | 21 | #define pgtable_cache_size (pgt_quicklists.pgtable_cache_sz) |
22 | #define pgd_cache_size (pgt_quicklists.pgd_cache_sz) | 22 | #define pgd_cache_size (pgt_quicklists.pgd_cache_sz) |
23 | 23 | ||
24 | extern void check_pgt_cache(void); | 24 | #define check_pgt_cache() do { } while (0) |
25 | BTFIXUPDEF_CALL(void, do_check_pgt_cache, int, int) | ||
26 | #define do_check_pgt_cache(low,high) BTFIXUP_CALL(do_check_pgt_cache)(low,high) | ||
27 | 25 | ||
28 | BTFIXUPDEF_CALL(pgd_t *, get_pgd_fast, void) | 26 | BTFIXUPDEF_CALL(pgd_t *, get_pgd_fast, void) |
29 | #define get_pgd_fast() BTFIXUP_CALL(get_pgd_fast)() | 27 | #define get_pgd_fast() BTFIXUP_CALL(get_pgd_fast)() |
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index d8e973dab076..bb23036c3228 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c | |||
@@ -82,7 +82,6 @@ void cpu_idle(void) | |||
82 | cpu_relax(); | 82 | cpu_relax(); |
83 | } | 83 | } |
84 | schedule_preempt_disabled(); | 84 | schedule_preempt_disabled(); |
85 | check_pgt_cache(); | ||
86 | } | 85 | } |
87 | } | 86 | } |
88 | 87 | ||
@@ -105,7 +104,6 @@ void cpu_idle(void) | |||
105 | cpu_relax(); | 104 | cpu_relax(); |
106 | } | 105 | } |
107 | schedule_preempt_disabled(); | 106 | schedule_preempt_disabled(); |
108 | check_pgt_cache(); | ||
109 | } | 107 | } |
110 | } | 108 | } |
111 | 109 | ||
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 753676ccdc65..79b215e9b5ca 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c | |||
@@ -286,22 +286,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) | |||
286 | } | 286 | } |
287 | 287 | ||
288 | /* | 288 | /* |
289 | * check_pgt_cache | ||
290 | * | ||
291 | * This is called at the end of unmapping of VMA (zap_page_range), | ||
292 | * to rescan the page cache for architecture specific things. | ||
293 | * Most architectures define check_pgt_cache empty. | ||
294 | * | ||
295 | * We simply copy the 2.4 implementation for now. | ||
296 | */ | ||
297 | static int pgt_cache_water[2] = { 25, 50 }; | ||
298 | |||
299 | void check_pgt_cache(void) | ||
300 | { | ||
301 | do_check_pgt_cache(pgt_cache_water[0], pgt_cache_water[1]); | ||
302 | } | ||
303 | |||
304 | /* | ||
305 | * paging_init() sets up the page tables: We call the MMU specific | 289 | * paging_init() sets up the page tables: We call the MMU specific |
306 | * init routine based upon the Sun model type on the Sparc. | 290 | * init routine based upon the Sun model type on the Sparc. |
307 | * | 291 | * |
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 85d7f82e5785..cb18fa80b19c 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
@@ -2122,11 +2122,6 @@ static void __init get_srmmu_type(void) | |||
2122 | srmmu_is_bad(); | 2122 | srmmu_is_bad(); |
2123 | } | 2123 | } |
2124 | 2124 | ||
2125 | /* don't laugh, static pagetables */ | ||
2126 | static void srmmu_check_pgt_cache(int low, int high) | ||
2127 | { | ||
2128 | } | ||
2129 | |||
2130 | extern unsigned long spwin_mmu_patchme, fwin_mmu_patchme, | 2125 | extern unsigned long spwin_mmu_patchme, fwin_mmu_patchme, |
2131 | tsetup_mmu_patchme, rtrap_mmu_patchme; | 2126 | tsetup_mmu_patchme, rtrap_mmu_patchme; |
2132 | 2127 | ||
@@ -2168,7 +2163,6 @@ void __init ld_mmu_srmmu(void) | |||
2168 | #ifndef CONFIG_SMP | 2163 | #ifndef CONFIG_SMP |
2169 | BTFIXUPSET_CALL(___xchg32, ___xchg32_sun4md, BTFIXUPCALL_SWAPG1G2); | 2164 | BTFIXUPSET_CALL(___xchg32, ___xchg32_sun4md, BTFIXUPCALL_SWAPG1G2); |
2170 | #endif | 2165 | #endif |
2171 | BTFIXUPSET_CALL(do_check_pgt_cache, srmmu_check_pgt_cache, BTFIXUPCALL_NOP); | ||
2172 | 2166 | ||
2173 | BTFIXUPSET_CALL(set_pte, srmmu_set_pte, BTFIXUPCALL_SWAPO0O1); | 2167 | BTFIXUPSET_CALL(set_pte, srmmu_set_pte, BTFIXUPCALL_SWAPO0O1); |
2174 | 2168 | ||