diff options
Diffstat (limited to 'arch/mn10300')
-rw-r--r-- | arch/mn10300/include/asm/pci.h | 1 | ||||
-rw-r--r-- | arch/mn10300/include/asm/pgalloc.h | 2 | ||||
-rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 35d2ed6396f6..19aecc90f7a4 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
@@ -59,7 +59,6 @@ void pcibios_penalize_isa_irq(int irq); | |||
59 | #include <linux/slab.h> | 59 | #include <linux/slab.h> |
60 | #include <asm/scatterlist.h> | 60 | #include <asm/scatterlist.h> |
61 | #include <linux/string.h> | 61 | #include <linux/string.h> |
62 | #include <linux/mm.h> | ||
63 | #include <asm/io.h> | 62 | #include <asm/io.h> |
64 | 63 | ||
65 | struct pci_dev; | 64 | struct pci_dev; |
diff --git a/arch/mn10300/include/asm/pgalloc.h b/arch/mn10300/include/asm/pgalloc.h index ec057e1bd4cf..a19f11327cd8 100644 --- a/arch/mn10300/include/asm/pgalloc.h +++ b/arch/mn10300/include/asm/pgalloc.h | |||
@@ -51,6 +51,6 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | 53 | ||
54 | #define __pte_free_tlb(tlb, pte) tlb_remove_page((tlb), (pte)) | 54 | #define __pte_free_tlb(tlb, pte, addr) tlb_remove_page((tlb), (pte)) |
55 | 55 | ||
56 | #endif /* _ASM_PGALLOC_H */ | 56 | #endif /* _ASM_PGALLOC_H */ |
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index c96ba3da95ac..f4aa07934654 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
@@ -107,7 +107,7 @@ SECTIONS | |||
107 | __init_end = .; | 107 | __init_end = .; |
108 | /* freed after init ends here */ | 108 | /* freed after init ends here */ |
109 | 109 | ||
110 | BSS(4) | 110 | BSS_SECTION(0, PAGE_SIZE, 4) |
111 | 111 | ||
112 | _end = . ; | 112 | _end = . ; |
113 | 113 | ||