diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:55:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:55:52 -0400 |
| commit | 1f73897861b8ef0be64ff4b801f8d6f830f683b5 (patch) | |
| tree | b4bae8f12e1422113910d8cb00a19d010dc4a52f /include | |
| parent | b904d7131d116900524bd36ec170dcd97846bfd3 (diff) | |
| parent | 64ffc9ff424c65adcffe7d590018cc75e2d5d42a (diff) | |
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
kbuild: Revert part of e8d400a to resolve a conflict
kbuild: Fix checking of scm-identifier variable
gconfig: add support to show hidden options that have prompts
menuconfig: add support to show hidden options which have prompts
gconfig: remove show_debug option
gconfig: remove dbg_print_ptype() and dbg_print_stype()
kconfig: fix zconfdump()
kconfig: some small fixes
add random binaries to .gitignore
kbuild: Include gen_initramfs_list.sh and the file list in the .d file
kconfig: recalc symbol value before showing search results
.gitignore: ignore *.lzo files
headerdep: perlcritic warning
scripts/Makefile.lib: Align the output of LZO
kbuild: Generate modules.builtin in make modules_install
Revert "kbuild: specify absolute paths for cscope"
kbuild: Do not unnecessarily regenerate modules.builtin
headers_install: use local file handles
headers_check: fix perl warnings
export_report: fix perl warnings
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/percpu.h | 10 | ||||
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 38 | ||||
| -rw-r--r-- | include/linux/cache.h | 2 | ||||
| -rw-r--r-- | include/linux/init.h | 2 | ||||
| -rw-r--r-- | include/linux/init_task.h | 2 | ||||
| -rw-r--r-- | include/linux/linkage.h | 8 | ||||
| -rw-r--r-- | include/linux/percpu-defs.h | 4 | ||||
| -rw-r--r-- | include/linux/spinlock.h | 2 |
8 files changed, 34 insertions, 34 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 | *(.data.percpu.first) \ | 672 | *(.data..percpu..first) \ |
| 673 | *(.data.percpu.page_aligned) \ | 673 | *(.data..percpu..page_aligned) \ |
| 674 | *(.data.percpu) \ | 674 | *(.data..percpu) \ |
| 675 | *(.data.percpu.shared_aligned) \ | 675 | *(.data..percpu..shared_aligned) \ |
| 676 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ | 676 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ |
| 677 | } phdr \ | 677 | } phdr \ |
| 678 | . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu); | 678 | . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu); |
| 679 | 679 | ||
| 680 | /** | 680 | /** |
| 681 | * PERCPU - define output section for percpu area, simple version | 681 | * PERCPU - define output section for percpu area, simple version |
| @@ -687,18 +687,18 @@ | |||
| 687 | * | 687 | * |
| 688 | * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except | 688 | * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except |
| 689 | * that __per_cpu_load is defined as a relative symbol against | 689 | * that __per_cpu_load is defined as a relative symbol against |
| 690 | * .data.percpu which is required for relocatable x86_32 | 690 | * .data..percpu which is required for relocatable x86_32 |
| 691 | * configuration. | 691 | * configuration. |
| 692 | */ | 692 | */ |
| 693 | #define PERCPU(align) \ | 693 | #define PERCPU(align) \ |
| 694 | . = ALIGN(align); \ | 694 | . = ALIGN(align); \ |
| 695 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \ | 695 | .data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \ |
| 696 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ | 696 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ |
| 697 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ | 697 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ |
| 698 | *(.data.percpu.first) \ | 698 | *(.data..percpu..first) \ |
| 699 | *(.data.percpu.page_aligned) \ | 699 | *(.data..percpu..page_aligned) \ |
| 700 | *(.data.percpu) \ | 700 | *(.data..percpu) \ |
| 701 | *(.data.percpu.shared_aligned) \ | 701 | *(.data..percpu..shared_aligned) \ |
| 702 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ | 702 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ |
| 703 | } | 703 | } |
| 704 | 704 | ||
diff --git a/include/linux/cache.h b/include/linux/cache.h index 97e24881c4c6..4c570653ab84 100644 --- a/include/linux/cache.h +++ b/include/linux/cache.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #ifndef __cacheline_aligned | 31 | #ifndef __cacheline_aligned |
| 32 | #define __cacheline_aligned \ | 32 | #define __cacheline_aligned \ |
| 33 | __attribute__((__aligned__(SMP_CACHE_BYTES), \ | 33 | __attribute__((__aligned__(SMP_CACHE_BYTES), \ |
| 34 | __section__(".data.cacheline_aligned"))) | 34 | __section__(".data..cacheline_aligned"))) |
| 35 | #endif /* __cacheline_aligned */ | 35 | #endif /* __cacheline_aligned */ |
| 36 | 36 | ||
| 37 | #ifndef __cacheline_aligned_in_smp | 37 | #ifndef __cacheline_aligned_in_smp |
diff --git a/include/linux/init.h b/include/linux/init.h index ab1d31f9352b..de994304e0bb 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -301,7 +301,7 @@ void __init parse_early_options(char *cmdline); | |||
| 301 | #endif | 301 | #endif |
| 302 | 302 | ||
| 303 | /* Data marked not to be saved by software suspend */ | 303 | /* Data marked not to be saved by software suspend */ |
| 304 | #define __nosavedata __section(.data.nosave) | 304 | #define __nosavedata __section(.data..nosave) |
| 305 | 305 | ||
| 306 | /* This means "can be init if no module support, otherwise module load | 306 | /* This means "can be init if no module support, otherwise module load |
| 307 | may call it." */ | 307 | may call it." */ |
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 2beaa13492be..1f43fa56f600 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -183,7 +183,7 @@ extern struct cred init_cred; | |||
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | /* Attach to the init_task data structure for proper alignment */ | 185 | /* Attach to the init_task data structure for proper alignment */ |
| 186 | #define __init_task_data __attribute__((__section__(".data.init_task"))) | 186 | #define __init_task_data __attribute__((__section__(".data..init_task"))) |
| 187 | 187 | ||
| 188 | 188 | ||
| 189 | #endif | 189 | #endif |
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 5126cceb6ae9..7135ebc8428c 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | # define asmregparm | 18 | # define asmregparm |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
| 21 | #define __page_aligned_data __section(.data.page_aligned) __aligned(PAGE_SIZE) | 21 | #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE) |
| 22 | #define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE) | 22 | #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE) |
| 23 | 23 | ||
| 24 | /* | 24 | /* |
| 25 | * For assembly routines. | 25 | * For assembly routines. |
| @@ -27,8 +27,8 @@ | |||
| 27 | * Note when using these that you must specify the appropriate | 27 | * Note when using these that you must specify the appropriate |
| 28 | * alignment directives yourself | 28 | * alignment directives yourself |
| 29 | */ | 29 | */ |
| 30 | #define __PAGE_ALIGNED_DATA .section ".data.page_aligned", "aw" | 30 | #define __PAGE_ALIGNED_DATA .section ".data..page_aligned", "aw" |
| 31 | #define __PAGE_ALIGNED_BSS .section ".bss.page_aligned", "aw" | 31 | #define __PAGE_ALIGNED_BSS .section ".bss..page_aligned", "aw" |
| 32 | 32 | ||
| 33 | /* | 33 | /* |
| 34 | * This is used by architectures to keep arguments on the stack | 34 | * This is used by architectures to keep arguments on the stack |
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 68567c0b3a5d..ce2dc655cd1d 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h | |||
| @@ -131,11 +131,11 @@ | |||
| 131 | * Declaration/definition used for per-CPU variables that must be page aligned. | 131 | * Declaration/definition used for per-CPU variables that must be page aligned. |
| 132 | */ | 132 | */ |
| 133 | #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ | 133 | #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ |
| 134 | DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \ | 134 | DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \ |
| 135 | __aligned(PAGE_SIZE) | 135 | __aligned(PAGE_SIZE) |
| 136 | 136 | ||
| 137 | #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ | 137 | #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ |
| 138 | DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \ | 138 | DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \ |
| 139 | __aligned(PAGE_SIZE) | 139 | __aligned(PAGE_SIZE) |
| 140 | 140 | ||
| 141 | /* | 141 | /* |
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 89fac6a3f78b..f8854655860e 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
| @@ -60,7 +60,7 @@ | |||
| 60 | /* | 60 | /* |
| 61 | * Must define these before including other files, inline functions need them | 61 | * Must define these before including other files, inline functions need them |
| 62 | */ | 62 | */ |
| 63 | #define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME | 63 | #define LOCK_SECTION_NAME ".text..lock."KBUILD_BASENAME |
| 64 | 64 | ||
| 65 | #define LOCK_SECTION_START(extra) \ | 65 | #define LOCK_SECTION_START(extra) \ |
| 66 | ".subsection 1\n\t" \ | 66 | ".subsection 1\n\t" \ |
