(mostly i386) mm cleanup (fwd)
PATCH 1/1 (mostly i386) mm cleanup (fwd)
The patch forwarded below (already ACK'ed by David Howells) still applies and compiles against 2.6.11-rc1-mm1.
Please apply.
----- Forwarded message from Adrian Bunk <[email protected]> -----
Date: Sun, 12 Dec 2004 03:10:56 +0100
From: Adrian Bunk <[email protected]>
To: Dave Hansen <[email protected]>, [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected]
Subject: [2.6 patch] (mostly i386) mm cleanup
The patch below contains the following fixes:
- arch/i386/mm/boot_ioremap.c: make a variable static
- frv/ppc highmem.c: remove stale kmap_init prototypes
- arch/um/kernel/mem.c: make kmap_init static
- arch/i386/mm/init.c: make five functions static
diffstat output:
arch/i386/mm/boot_ioremap.c | 4 ++-- arch/i386/mm/init.c | 10 +++++----- arch/um/kernel/mem.c | 2 +- include/asm-frv/highmem.h | 2 -- include/asm-i386/highmem.h | 2 -- include/asm-ppc/highmem.h | 2 -- 6 files changed, 8 insertions(+), 14 deletions(-)
arch/i386/mm/boot_ioremap.c renamed from arch/i386/mm/boot_ioremap.c.old +2 -2
@@ -61,8 +61,8 @@/* the virtual space we're going to remap comes from this array */ #define BOOT_IOREMAP_PAGES 4#define BOOT_IOREMAP_SIZE (BOOT_IOREMAP_PAGES*PAGE_SIZE) -__initdata char boot_ioremap_space[BOOT_IOREMAP_SIZE] - __attribute__ ((aligned (PAGE_SIZE))); +static __initdata char boot_ioremap_space[BOOT_IOREMAP_SIZE] + __attribute__ ((aligned (PAGE_SIZE)));/* * This only applies to things which need to ioremap before paging_init()
include/asm-frv/highmem.h renamed from include/asm-frv/highmem.h.old +0 -2
@@ -44,8 +44,6 @@#define kmap_pte ______kmap_pte_in_TLBextern pte_t *pkmap_page_table; -extern void kmap_init (void ); -#define flush_cache_kmaps () do { } while (0)/*
include/asm-ppc/highmem.h renamed from include/asm-ppc/highmem.h.old +0 -2
@@ -35,8 +35,6 @@extern pgprot_t kmap_prot;extern pte_t *pkmap_page_table; -extern void kmap_init (void )__init ; -/* * Right now we initialize only a single pte table. It can be extended * easily, subsequent pte tables have to be allocated in one physical
arch/um/kernel/mem.c renamed from arch/um/kernel/mem.c.old +1 -1
@@ -141,7 +141,7 @@pte_offset_kernel (pmd_offset (pml4_pgd_offset (pml4_offset_k (vaddr), \ vaddr), (vaddr)), (vaddr)) -void __init kmap_init (void ) +static void __init kmap_init (void ) {unsigned long kmap_vstart;
include/asm-i386/highmem.h renamed from include/asm-i386/highmem.h.old +0 -2
@@ -33,8 +33,6 @@extern pgprot_t kmap_prot;extern pte_t *pkmap_page_table; -extern void kmap_init (void ); -/* * Right now we initialize only a single pte table. It can be extended * easily, subsequent pte tables have to be allocated in one physical
arch/i386/mm/init.c renamed from arch/i386/mm/init.c.old +5 -5
@@ -254,7 +254,7 @@#define kmap_get_fixmap_pte (vaddr) \ pte_offset_kernel(pmd_offset(pml4_pgd_offset(pml4_offset_k(vaddr), vaddr), (vaddr)), (vaddr)) -void __init kmap_init (void ) +static void __init kmap_init (void ) {unsigned long kmap_vstart;
@@ -265,7 +265,7 @@ kmap_prot =PAGE_KERNEL ; } -void __init permanent_kmaps_init (pgd_t *pgd_base) +static void __init permanent_kmaps_init (pgd_t *pgd_base) {pgd_t *pgd;pmd_t *pmd;
@@ -294,7 +294,7 @@ }#ifndef CONFIG_DISCONTIGMEM -void __init set_highmem_pages_init (int bad_ppro) +static void __init set_highmem_pages_init (int bad_ppro) {int pfn;for (pfn = highstart_pfn; pfn < highend_pfn; pfn++)
@@ -408,7 +408,7 @@ }#ifndef CONFIG_DISCONTIGMEM -void __init zone_sizes_init (void ) +static void __init zone_sizes_init (void ) {unsigned long zones_size[MAX_NR_ZONES ] = {0 ,0 ,0 };unsigned int max_dma, high, low;
@@ -545,7 +545,7 @@* but fortunately the switch to using exceptions got rid of all that. */ -void __init test_wp_bit (void ) +static void __init test_wp_bit (void ) {printk ("Checking if this processor honours the WP bit even in supervisor mode... " );
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
----- End forwarded message -----