diff options
author | Andi Kleen <ak@suse.de> | 2007-08-14 20:40:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 13:25:25 -0400 |
commit | 6e3515352bdd1c42d78bd16dae06dd429d6b1861 (patch) | |
tree | e27c97d8a0887a6010b97e91c3f24a4a7dd7926e /arch | |
parent | 0328ecef9041fe477efc2404fd3aaa29e7ee0430 (diff) |
x86_64: Change PMDS invocation to single macro
Very old binutils (2.12.90...) seem to have trouble with newlines
in assembler macro invocation. They put them into the resulting
argument expansion. In this case this lead to a parse error because
a .rept expression ended up spread over multiple lines. Change the PMDS()
invocation to a single line.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/kernel/head.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S index e89abcdbdde8..b6167fe3330e 100644 --- a/arch/x86_64/kernel/head.S +++ b/arch/x86_64/kernel/head.S | |||
@@ -345,8 +345,7 @@ NEXT_PAGE(level2_kernel_pgt) | |||
345 | /* 40MB kernel mapping. The kernel code cannot be bigger than that. | 345 | /* 40MB kernel mapping. The kernel code cannot be bigger than that. |
346 | When you change this change KERNEL_TEXT_SIZE in page.h too. */ | 346 | When you change this change KERNEL_TEXT_SIZE in page.h too. */ |
347 | /* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */ | 347 | /* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */ |
348 | PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, | 348 | PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, KERNEL_TEXT_SIZE/PMD_SIZE) |
349 | KERNEL_TEXT_SIZE/PMD_SIZE) | ||
350 | /* Module mapping starts here */ | 349 | /* Module mapping starts here */ |
351 | .fill (PTRS_PER_PMD - (KERNEL_TEXT_SIZE/PMD_SIZE)),8,0 | 350 | .fill (PTRS_PER_PMD - (KERNEL_TEXT_SIZE/PMD_SIZE)),8,0 |
352 | 351 | ||