diff options
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/pgtable.h | 2 | ||||
-rw-r--r-- | include/asm-generic/topology.h | 3 | ||||
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 19 |
3 files changed, 22 insertions, 2 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 4fce3db2cecc..ef87f889ef62 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
@@ -195,7 +195,6 @@ static inline int pmd_none_or_clear_bad(pmd_t *pmd) | |||
195 | } | 195 | } |
196 | return 0; | 196 | return 0; |
197 | } | 197 | } |
198 | #endif /* CONFIG_MMU */ | ||
199 | 198 | ||
200 | static inline pte_t __ptep_modify_prot_start(struct mm_struct *mm, | 199 | static inline pte_t __ptep_modify_prot_start(struct mm_struct *mm, |
201 | unsigned long addr, | 200 | unsigned long addr, |
@@ -253,6 +252,7 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm, | |||
253 | __ptep_modify_prot_commit(mm, addr, ptep, pte); | 252 | __ptep_modify_prot_commit(mm, addr, ptep, pte); |
254 | } | 253 | } |
255 | #endif /* __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION */ | 254 | #endif /* __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION */ |
255 | #endif /* CONFIG_MMU */ | ||
256 | 256 | ||
257 | /* | 257 | /* |
258 | * A facility to provide lazy MMU batching. This allows PTE updates and | 258 | * A facility to provide lazy MMU batching. This allows PTE updates and |
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h index a6aea79bca4f..54bbf6e04ee8 100644 --- a/include/asm-generic/topology.h +++ b/include/asm-generic/topology.h | |||
@@ -60,7 +60,8 @@ | |||
60 | #ifndef node_to_cpumask_ptr | 60 | #ifndef node_to_cpumask_ptr |
61 | 61 | ||
62 | #define node_to_cpumask_ptr(v, node) \ | 62 | #define node_to_cpumask_ptr(v, node) \ |
63 | cpumask_t _##v = node_to_cpumask(node), *v = &_##v | 63 | cpumask_t _##v = node_to_cpumask(node); \ |
64 | const cpumask_t *v = &_##v | ||
64 | 65 | ||
65 | #define node_to_cpumask_ptr_next(v, node) \ | 66 | #define node_to_cpumask_ptr_next(v, node) \ |
66 | _##v = node_to_cpumask(node) | 67 | _##v = node_to_cpumask(node) |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f1992dc5c424..729f6b0a60e9 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
@@ -67,6 +67,8 @@ | |||
67 | *(.rodata1) \ | 67 | *(.rodata1) \ |
68 | } \ | 68 | } \ |
69 | \ | 69 | \ |
70 | BUG_TABLE \ | ||
71 | \ | ||
70 | /* PCI quirks */ \ | 72 | /* PCI quirks */ \ |
71 | .pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \ | 73 | .pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \ |
72 | VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \ | 74 | VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \ |
@@ -84,6 +86,19 @@ | |||
84 | VMLINUX_SYMBOL(__start_pci_fixups_resume) = .; \ | 86 | VMLINUX_SYMBOL(__start_pci_fixups_resume) = .; \ |
85 | *(.pci_fixup_resume) \ | 87 | *(.pci_fixup_resume) \ |
86 | VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ | 88 | VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ |
89 | VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .; \ | ||
90 | *(.pci_fixup_resume_early) \ | ||
91 | VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .; \ | ||
92 | VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .; \ | ||
93 | *(.pci_fixup_suspend) \ | ||
94 | VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .; \ | ||
95 | } \ | ||
96 | \ | ||
97 | /* Built-in firmware blobs */ \ | ||
98 | .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \ | ||
99 | VMLINUX_SYMBOL(__start_builtin_fw) = .; \ | ||
100 | *(.builtin_fw) \ | ||
101 | VMLINUX_SYMBOL(__end_builtin_fw) = .; \ | ||
87 | } \ | 102 | } \ |
88 | \ | 103 | \ |
89 | /* RapidIO route ops */ \ | 104 | /* RapidIO route ops */ \ |
@@ -312,6 +327,7 @@ | |||
312 | .stab.indexstr 0 : { *(.stab.indexstr) } \ | 327 | .stab.indexstr 0 : { *(.stab.indexstr) } \ |
313 | .comment 0 : { *(.comment) } | 328 | .comment 0 : { *(.comment) } |
314 | 329 | ||
330 | #ifdef CONFIG_GENERIC_BUG | ||
315 | #define BUG_TABLE \ | 331 | #define BUG_TABLE \ |
316 | . = ALIGN(8); \ | 332 | . = ALIGN(8); \ |
317 | __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \ | 333 | __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \ |
@@ -319,6 +335,9 @@ | |||
319 | *(__bug_table) \ | 335 | *(__bug_table) \ |
320 | __stop___bug_table = .; \ | 336 | __stop___bug_table = .; \ |
321 | } | 337 | } |
338 | #else | ||
339 | #define BUG_TABLE | ||
340 | #endif | ||
322 | 341 | ||
323 | #ifdef CONFIG_PM_TRACE | 342 | #ifdef CONFIG_PM_TRACE |
324 | #define TRACEDATA \ | 343 | #define TRACEDATA \ |