diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:54:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:54:21 -0400 |
| commit | 91151240ed8e97cc4457dae4094153c2744f1eb8 (patch) | |
| tree | 201a449a659bcc31cf528f4630b8ec4c49b26f02 /Documentation | |
| parent | 211baf4ffc6e78a2299bb4215264ada313048ec5 (diff) | |
| parent | fe8e0c25cad28e8858ecfa5863333c70685a6811 (diff) | |
Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE
x86: Move alloc_desk_mask variables inside ifdef
x86-32: Align IRQ stacks properly
x86: Remove CONFIG_4KSTACKS
x86: Always use irq stacks
Fixed up trivial conflicts in include/linux/{irq.h, percpu-defs.h}
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/x86_64/kernel-stacks | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/x86/x86_64/kernel-stacks b/Documentation/x86/x86_64/kernel-stacks index 5ad65d51fb95..a01eec5d1d0b 100644 --- a/Documentation/x86/x86_64/kernel-stacks +++ b/Documentation/x86/x86_64/kernel-stacks | |||
| @@ -18,9 +18,9 @@ specialized stacks contain no useful data. The main CPU stacks are: | |||
| 18 | Used for external hardware interrupts. If this is the first external | 18 | Used for external hardware interrupts. If this is the first external |
| 19 | hardware interrupt (i.e. not a nested hardware interrupt) then the | 19 | hardware interrupt (i.e. not a nested hardware interrupt) then the |
| 20 | kernel switches from the current task to the interrupt stack. Like | 20 | kernel switches from the current task to the interrupt stack. Like |
| 21 | the split thread and interrupt stacks on i386 (with CONFIG_4KSTACKS), | 21 | the split thread and interrupt stacks on i386, this gives more room |
| 22 | this gives more room for kernel interrupt processing without having | 22 | for kernel interrupt processing without having to increase the size |
| 23 | to increase the size of every per thread stack. | 23 | of every per thread stack. |
| 24 | 24 | ||
| 25 | The interrupt stack is also used when processing a softirq. | 25 | The interrupt stack is also used when processing a softirq. |
| 26 | 26 | ||