diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 08:55:52 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 08:55:52 -0700 | 
| commit | 1f73897861b8ef0be64ff4b801f8d6f830f683b5 (patch) | |
| tree | b4bae8f12e1422113910d8cb00a19d010dc4a52f /arch/x86 | |
| parent | b904d7131d116900524bd36ec170dcd97846bfd3 (diff) | |
| parent | 64ffc9ff424c65adcffe7d590018cc75e2d5d42a (diff) | |
| download | olio-linux-3.10-1f73897861b8ef0be64ff4b801f8d6f830f683b5.tar.xz olio-linux-3.10-1f73897861b8ef0be64ff4b801f8d6f830f683b5.zip  | |
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 'arch/x86')
| -rw-r--r-- | arch/x86/.gitignore | 3 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/mkpiggy.c | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux.lds.S | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/cache.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/init_task.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 4 | 
8 files changed, 12 insertions, 9 deletions
diff --git a/arch/x86/.gitignore b/arch/x86/.gitignore new file mode 100644 index 00000000000..028079065af --- /dev/null +++ b/arch/x86/.gitignore @@ -0,0 +1,3 @@ +boot/compressed/vmlinux +tools/test_get_len + diff --git a/arch/x86/boot/compressed/mkpiggy.c b/arch/x86/boot/compressed/mkpiggy.c index bcbd36c4143..5c228129d17 100644 --- a/arch/x86/boot/compressed/mkpiggy.c +++ b/arch/x86/boot/compressed/mkpiggy.c @@ -77,7 +77,7 @@ int main(int argc, char *argv[])  	offs += 32*1024 + 18;	/* Add 32K + 18 bytes slack */  	offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ -	printf(".section \".rodata.compressed\",\"a\",@progbits\n"); +	printf(".section \".rodata..compressed\",\"a\",@progbits\n");  	printf(".globl z_input_len\n");  	printf("z_input_len = %lu\n", ilen);  	printf(".globl z_output_len\n"); diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S index a6f1a59a5b0..5ddabceee12 100644 --- a/arch/x86/boot/compressed/vmlinux.lds.S +++ b/arch/x86/boot/compressed/vmlinux.lds.S @@ -26,8 +26,8 @@ SECTIONS  		HEAD_TEXT  		_ehead = . ;  	} -	.rodata.compressed : { -		*(.rodata.compressed) +	.rodata..compressed : { +		*(.rodata..compressed)  	}  	.text :	{  		_text = .; 	/* Text */ diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h index 2f9047cfaac..48f99f15452 100644 --- a/arch/x86/include/asm/cache.h +++ b/arch/x86/include/asm/cache.h @@ -7,7 +7,7 @@  #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)  #define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT) -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))  #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT  #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT) diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index 8ded418b059..13ab720573e 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S @@ -1,4 +1,4 @@ -	.section .text.page_aligned +	.section .text..page_aligned  #include <linux/linkage.h>  #include <asm/segment.h>  #include <asm/page_types.h> diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c index 3a54dcb9cd0..43e9ccf4494 100644 --- a/arch/x86/kernel/init_task.c +++ b/arch/x86/kernel/init_task.c @@ -34,7 +34,7 @@ EXPORT_SYMBOL(init_task);  /*   * per-CPU TSS segments. Threads are completely 'soft' on Linux,   * no more per-task TSS's. The TSS size is kept cacheline-aligned - * so they are allowed to end up in the .data.cacheline_aligned + * so they are allowed to end up in the .data..cacheline_aligned   * section. Since TSS's are completely CPU-local, we want them   * on exact cacheline boundaries, to eliminate cacheline ping-pong.   */ diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index a867940a6df..cf592767812 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -247,7 +247,7 @@ void __init setup_per_cpu_areas(void)  #endif  #endif  		/* -		 * Up to this point, the boot CPU has been using .data.init +		 * Up to this point, the boot CPU has been using .init.data  		 * area.  Reload any changed state for the boot CPU.  		 */  		if (cpu == boot_cpu_id) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 2cc249718c4..d0bb52296fa 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -97,7 +97,7 @@ SECTIONS  		HEAD_TEXT  #ifdef CONFIG_X86_32  		. = ALIGN(PAGE_SIZE); -		*(.text.page_aligned) +		*(.text..page_aligned)  #endif  		. = ALIGN(8);  		_stext = .; @@ -305,7 +305,7 @@ SECTIONS  	. = ALIGN(PAGE_SIZE);  	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {  		__bss_start = .; -		*(.bss.page_aligned) +		*(.bss..page_aligned)  		*(.bss)  		. = ALIGN(4);  		__bss_stop = .;  |