This complements commit 47f19a0814e80e1d4e5c17d61b70fca85ea09162,
reverting one leftover of fe8e0c25cad28e8858ecfa5863333c70685a6811.
Signed-off-by: Jan Beulich <[email protected]>
Cc: Alexander van Heukelum <[email protected]>
---
arch/x86/kernel/vmlinux.lds.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 2.6.38-rc4/arch/x86/kernel/vmlinux.lds.S
+++ 2.6.38-rc4-x86-percpu-align/arch/x86/kernel/vmlinux.lds.S
@@ -305,7 +305,7 @@ SECTIONS
}
#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
- PERCPU(THREAD_SIZE)
+ PERCPU(PAGE_SIZE)
#endif
. = ALIGN(PAGE_SIZE);
Hi Jan,
This is indeed a leftover. Thanks.
This was once done to fix i386-UP, because the irq stacks were part of the percpu area. The stacks are now allocated dynamically.
Acked-by: Alexander van Heukelum <[email protected]>
Greetings,
Alexander
On Wed, 09 Feb 2011 08:22 +0000, "Jan Beulich" <[email protected]> wrote:
> This complements commit 47f19a0814e80e1d4e5c17d61b70fca85ea09162,
> reverting one leftover of fe8e0c25cad28e8858ecfa5863333c70685a6811.
>
> Signed-off-by: Jan Beulich <[email protected]>
> Cc: Alexander van Heukelum <[email protected]>
>
> ---
> arch/x86/kernel/vmlinux.lds.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- 2.6.38-rc4/arch/x86/kernel/vmlinux.lds.S
> +++ 2.6.38-rc4-x86-percpu-align/arch/x86/kernel/vmlinux.lds.S
> @@ -305,7 +305,7 @@ SECTIONS
> }
>
> #if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
> - PERCPU(THREAD_SIZE)
> + PERCPU(PAGE_SIZE)
> #endif
>
> . = ALIGN(PAGE_SIZE);
>
>
>
Commit-ID: 94d1ac8b55799be10487fff9766cce6d6628462a
Gitweb: http://git.kernel.org/tip/94d1ac8b55799be10487fff9766cce6d6628462a
Author: Jan Beulich <[email protected]>
AuthorDate: Wed, 9 Feb 2011 08:22:46 +0000
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 10 Feb 2011 13:31:36 +0100
x86: Reduce back the alignment of the per-CPU data section
This complements commit:
47f19a0814e8: percpu: Remove the multi-page alignment facility
reverting one leftover of:
fe8e0c25cad2: x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE
Signed-off-by: Jan Beulich <[email protected]>
Acked-by: Alexander van Heukelum <[email protected]>
Cc: Linus Torvalds <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Cc: Alexander van Heukelum <[email protected]>
---
arch/x86/kernel/vmlinux.lds.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index bf47007..e9f7a3c 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -305,7 +305,7 @@ SECTIONS
}
#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
- PERCPU(THREAD_SIZE)
+ PERCPU(PAGE_SIZE)
#endif
. = ALIGN(PAGE_SIZE);