diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /include | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'include')
45 files changed, 530 insertions, 155 deletions
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 04f91c2d3f7b..b5043a9890d8 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h | |||
| @@ -80,7 +80,7 @@ extern void setup_per_cpu_areas(void); | |||
| 80 | 80 | ||
| 81 | #ifndef PER_CPU_BASE_SECTION | 81 | #ifndef PER_CPU_BASE_SECTION |
| 82 | #ifdef CONFIG_SMP | 82 | #ifdef CONFIG_SMP |
| 83 | #define PER_CPU_BASE_SECTION ".data.percpu" | 83 | #define PER_CPU_BASE_SECTION ".data..percpu" |
| 84 | #else | 84 | #else |
| 85 | #define PER_CPU_BASE_SECTION ".data" | 85 | #define PER_CPU_BASE_SECTION ".data" |
| 86 | #endif | 86 | #endif |
| @@ -92,15 +92,15 @@ extern void setup_per_cpu_areas(void); | |||
| 92 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 92 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
| 93 | #define PER_CPU_ALIGNED_SECTION "" | 93 | #define PER_CPU_ALIGNED_SECTION "" |
| 94 | #else | 94 | #else |
| 95 | #define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned" | 95 | #define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned" |
| 96 | #define PER_CPU_ALIGNED_SECTION ".shared_aligned" | 96 | #define PER_CPU_ALIGNED_SECTION "..shared_aligned" |
| 97 | #endif | 97 | #endif |
| 98 | #define PER_CPU_FIRST_SECTION ".first" | 98 | #define PER_CPU_FIRST_SECTION "..first" |
| 99 | 99 | ||
| 100 | #else | 100 | #else |
| 101 | 101 | ||
| 102 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 102 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
| 103 | #define PER_CPU_ALIGNED_SECTION ".shared_aligned" | 103 | #define PER_CPU_ALIGNED_SECTION "..shared_aligned" |
| 104 | #define PER_CPU_FIRST_SECTION "" | 104 | #define PER_CPU_FIRST_SECTION "" |
| 105 | 105 | ||
| 106 | #endif | 106 | #endif |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index ef779c6fc3d7..48c5299cbf26 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -175,25 +175,25 @@ | |||
| 175 | #define NOSAVE_DATA \ | 175 | #define NOSAVE_DATA \ |
| 176 | . = ALIGN(PAGE_SIZE); \ | 176 | . = ALIGN(PAGE_SIZE); \ |
| 177 | VMLINUX_SYMBOL(__nosave_begin) = .; \ | 177 | VMLINUX_SYMBOL(__nosave_begin) = .; \ |
| 178 | *(.data.nosave) \ | 178 | *(.data..nosave) \ |
| 179 | . = ALIGN(PAGE_SIZE); \ | 179 | . = ALIGN(PAGE_SIZE); \ |
| 180 | VMLINUX_SYMBOL(__nosave_end) = .; | 180 | VMLINUX_SYMBOL(__nosave_end) = .; |
| 181 | 181 | ||
| 182 | #define PAGE_ALIGNED_DATA(page_align) \ | 182 | #define PAGE_ALIGNED_DATA(page_align) \ |
| 183 | . = ALIGN(page_align); \ | 183 | . = ALIGN(page_align); \ |
| 184 | *(.data.page_aligned) | 184 | *(.data..page_aligned) |
| 185 | 185 | ||
| 186 | #define READ_MOSTLY_DATA(align) \ | 186 | #define READ_MOSTLY_DATA(align) \ |
| 187 | . = ALIGN(align); \ | 187 | . = ALIGN(align); \ |
| 188 | *(.data.read_mostly) | 188 | *(.data..read_mostly) |
| 189 | 189 | ||
| 190 | #define CACHELINE_ALIGNED_DATA(align) \ | 190 | #define CACHELINE_ALIGNED_DATA(align) \ |
| 191 | . = ALIGN(align); \ | 191 | . = ALIGN(align); \ |
| 192 | *(.data.cacheline_aligned) | 192 | *(.data..cacheline_aligned) |
| 193 | 193 | ||
| 194 | #define INIT_TASK_DATA(align) \ | 194 | #define INIT_TASK_DATA(align) \ |
| 195 | . = ALIGN(align); \ | 195 | . = ALIGN(align); \ |
| 196 | *(.data.init_task) | 196 | *(.data..init_task) |
| 197 | 197 | ||
| 198 | /* | 198 | /* |
| 199 | * Read only Data | 199 | * Read only Data |
| @@ -435,7 +435,7 @@ | |||
| 435 | */ | 435 | */ |
| 436 | #define INIT_TASK_DATA_SECTION(align) \ | 436 | #define INIT_TASK_DATA_SECTION(align) \ |
| 437 | . = ALIGN(align); \ | 437 | . = ALIGN(align); \ |
| 438 | .data.init_task : { \ | 438 | .data..init_task : { \ |
| 439 | INIT_TASK_DATA(align) \ | 439 | INIT_TASK_DATA(align) \ |
| 440 | } | 440 | } |
| 441 | 441 | ||
| @@ -499,7 +499,7 @@ | |||
| 499 | #define BSS(bss_align) \ | 499 | #define BSS(bss_align) \ |
| 500 | . = ALIGN(bss_align); \ | 500 | . = ALIGN(bss_align); \ |
| 501 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ | 501 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ |
| 502 | *(.bss.page_aligned) \ | 502 | *(.bss..page_aligned) \ |
| 503 | *(.dynbss) \ | 503 | *(.dynbss) \ |
| 504 | *(.bss) \ | 504 | *(.bss) \ |
| 505 | *(COMMON) \ | 505 | *(COMMON) \ |
| @@ -666,16 +666,16 @@ | |||
| 666 | */ | 666 | */ |
| 667 | #define PERCPU_VADDR(vaddr, phdr) \ | 667 | #define PERCPU_VADDR(vaddr, phdr) \ |
| 668 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ | 668 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ |
| 669 | .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ | 669 | .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ |
| 670 | - LOAD_OFFSET) { \ | 670 | - LOAD_OFFSET) { \ |
| 671 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ | 671 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ |
| 672 | |||
