diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 11:07:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 11:07:38 -0500 |
| commit | b80ebbf39fc628afab7d9cf94b84cfc51d845b2f (patch) | |
| tree | 106df5279ca8cb5b978bd4b9b35cfea02fe7ab86 | |
| parent | e5ffd2bb62c3f2c0d9f34e0d16fab6e2c8b056fb (diff) | |
| parent | 3af9815328bba76e8d11d71d6dbbd6f38beafe58 (diff) | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86_64: Align data segment to PAGE_SIZE boundary
[PATCH] x86-64: increase PHB1 split transaction timeout
[PATCH] x86-64: Fix C3 timer test
| -rw-r--r-- | arch/x86_64/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index edb24aa714b4..d9534e750d4f 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S | |||
| @@ -60,6 +60,7 @@ SECTIONS | |||
| 60 | } | 60 | } |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ | ||
| 63 | /* Data */ | 64 | /* Data */ |
| 64 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 65 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
| 65 | *(.data) | 66 | *(.data) |