diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-17 19:44:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-17 19:44:05 -0400 |
| commit | 71bfa15142177279ec63c0e400314bb81f3d7122 (patch) | |
| tree | 7b4c1c425a39d4dd70dba603b5db22140ef6db91 /arch/x86_64/kernel/vmlinux.lds.S | |
| parent | 080dfbe176c8dd87fc8f27e2941f31171b738f60 (diff) | |
| parent | 1714f9bfc92d6ee67e84127332a1fae27772acfe (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: Fix potential overflow in perfctr reservation
[PATCH] x86: Fix gcc 4.2 _proxy_pda workaround
Diffstat (limited to 'arch/x86_64/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/x86_64/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index b73212c0a550..5176ecf006ee 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S | |||
| @@ -13,7 +13,7 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") | |||
| 13 | OUTPUT_ARCH(i386:x86-64) | 13 | OUTPUT_ARCH(i386:x86-64) |
| 14 | ENTRY(phys_startup_64) | 14 | ENTRY(phys_startup_64) |
| 15 | jiffies_64 = jiffies; | 15 | jiffies_64 = jiffies; |
| 16 | _proxy_pda = 0; | 16 | _proxy_pda = 1; |
| 17 | PHDRS { | 17 | PHDRS { |
| 18 | text PT_LOAD FLAGS(5); /* R_E */ | 18 | text PT_LOAD FLAGS(5); /* R_E */ |
| 19 | data PT_LOAD FLAGS(7); /* RWE */ | 19 | data PT_LOAD FLAGS(7); /* RWE */ |