diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/arm/kernel/vmlinux.lds.S | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index a39c6a42d68a..ad2d66c93a5c 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #include <asm-generic/vmlinux.lds.h> | 6 | #include <asm-generic/vmlinux.lds.h> |
| 7 | #include <linux/config.h> | 7 | #include <linux/config.h> |
| 8 | #include <asm/thread_info.h> | ||
| 8 | 9 | ||
| 9 | OUTPUT_ARCH(arm) | 10 | OUTPUT_ARCH(arm) |
| 10 | ENTRY(stext) | 11 | ENTRY(stext) |
| @@ -103,7 +104,7 @@ SECTIONS | |||
| 103 | __data_loc = ALIGN(4); /* location in binary */ | 104 | __data_loc = ALIGN(4); /* location in binary */ |
| 104 | . = DATAADDR; | 105 | . = DATAADDR; |
| 105 | #else | 106 | #else |
| 106 | . = ALIGN(8192); | 107 | . = ALIGN(THREAD_SIZE); |
| 107 | __data_loc = .; | 108 | __data_loc = .; |
| 108 | #endif | 109 | #endif |
| 109 | 110 | ||