diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-12 15:52:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 15:52:47 -0400 |
commit | 6439d1c693bae2e7552ceaf16e45a6e819d18873 (patch) | |
tree | 3ccd1bfbef1794b6fd45a2e8181659105cc0c0fc /arch/sparc/mm/srmmu.c | |
parent | 3d8273675d4771d30e1e1c3dbae820dec55a0950 (diff) |
sparc32: Un-btfixup PAGE_{NONE,COPY,READONLY,SHARED,KERNEL}.
That lets us also get rid of the run-time initialization of
protection_map[] and all the ugly module workarounds for
PAGE_KERNEL and PAGE_SHARED to deal with the fact that we
can't do btfixups for modular code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm/srmmu.c')
-rw-r--r-- | arch/sparc/mm/srmmu.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index d852962d58d8..c6962715ef08 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
@@ -59,8 +59,6 @@ extern struct resource sparc_iomap; | |||
59 | 59 | ||
60 | extern unsigned long last_valid_pfn; | 60 | extern unsigned long last_valid_pfn; |
61 | 61 | ||
62 | extern unsigned long page_kernel; | ||
63 | |||
64 | static pgd_t *srmmu_swapper_pg_dir; | 62 | static pgd_t *srmmu_swapper_pg_dir; |
65 | 63 | ||
66 | #ifdef CONFIG_SMP | 64 | #ifdef CONFIG_SMP |
@@ -2078,13 +2076,6 @@ void __init ld_mmu_srmmu(void) | |||
2078 | extern void ld_mmu_iounit(void); | 2076 | extern void ld_mmu_iounit(void); |
2079 | extern void ___xchg32_sun4md(void); | 2077 | extern void ___xchg32_sun4md(void); |
2080 | 2078 | ||
2081 | BTFIXUPSET_INT(page_none, pgprot_val(SRMMU_PAGE_NONE)); | ||
2082 | PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); | ||
2083 | BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); | ||
2084 | BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY)); | ||
2085 | BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); | ||
2086 | page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); | ||
2087 | |||
2088 | /* Functions */ | 2079 | /* Functions */ |
2089 | #ifndef CONFIG_SMP | 2080 | #ifndef CONFIG_SMP |
2090 | BTFIXUPSET_CALL(___xchg32, ___xchg32_sun4md, BTFIXUPCALL_SWAPG1G2); | 2081 | BTFIXUPSET_CALL(___xchg32, ___xchg32_sun4md, BTFIXUPCALL_SWAPG1G2); |