diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 12:46:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 12:46:01 -0400 |
| commit | 29f31773e07772e73e3177a4af147244cd080554 (patch) | |
| tree | 369eb6c6bec35951158fb94ac241e0c81189c5b3 /arch/mn10300 | |
| parent | 59107c6525c0d325649eae807905d34772d5a664 (diff) | |
| parent | 112942353992d95099fb5b71c679ff1046fccfcf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: finally remove the obsolete variable $TOPDIR
gitignore: ignore scripts/ihex2fw
Kbuild: Disable the -Wformat-security gcc flag
gitignore: ignore gcov output files
kbuild: deb-pkg ship changelog
Add new __init_task_data macro to be used in arch init_task.c files.
asm-generic/vmlinux.lds.h: shuffle INIT_TASK* macro names in vmlinux.lds.h
Add new macros for page-aligned data and bss sections.
asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition.
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index bcebcefb4ad7..c96ba3da95ac 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
| @@ -61,7 +61,7 @@ SECTIONS | |||
| 61 | _edata = .; /* End of data section */ | 61 | _edata = .; /* End of data section */ |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | .data.init_task : { INIT_TASK(THREAD_SIZE); } | 64 | .data.init_task : { INIT_TASK_DATA(THREAD_SIZE); } |
| 65 | 65 | ||
| 66 | /* might get freed after init */ | 66 | /* might get freed after init */ |
| 67 | . = ALIGN(PAGE_SIZE); | 67 | . = ALIGN(PAGE_SIZE); |