diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
| commit | 56dbed129df3fdd4caf9018b6e7599ee258a5420 (patch) | |
| tree | b902491aef3a99efe0d9d49edd0f6e414dba654f /arch/powerpc/kernel/setup_64.c | |
| parent | 2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c (diff) | |
| parent | f878133bf022717b880d0e0995b8f91436fd605c (diff) | |
Merge branch 'linus' into idle-test
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index ce6f61c6f871..5a0401fcaebd 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -437,8 +437,8 @@ static void __init irqstack_early_init(void) | |||
| 437 | unsigned int i; | 437 | unsigned int i; |
| 438 | 438 | ||
| 439 | /* | 439 | /* |
| 440 | * interrupt stacks must be under 256MB, we cannot afford to take | 440 | * Interrupt stacks must be in the first segment since we |
| 441 | * SLB misses on them. | 441 | * cannot afford to take SLB misses on them. |
| 442 | */ | 442 | */ |
| 443 | for_each_possible_cpu(i) { | 443 | for_each_possible_cpu(i) { |
| 444 | softirq_ctx[i] = (struct thread_info *) | 444 | softirq_ctx[i] = (struct thread_info *) |