| commit | 91151240ed8e97cc4457dae4094153c2744f1eb8 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Oct 2010 15:54:21 +0000 (22 08:54 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Oct 2010 15:54:21 +0000 (22 08:54 -0700) | ||
| tree | 201a449a659bcc31cf528f4630b8ec4c49b26f02 | treesnapshot (tar.gz zip) |
| parent | 211baf4ffc6e78a2299bb4215264ada313048ec5 | commitdiff |
| parent | fe8e0c25cad28e8858ecfa5863333c70685a6811 | commitdiff |
Merge branch 'x86-irq-for-linus' of git://git./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}
* '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}
| arch/x86/Kconfig.debug | diff1 | diff2 | blobhistory |
| arch/x86/kernel/vmlinux.lds.S | diff1 | diff2 | blobhistory |
| include/linux/percpu-defs.h | diff1 | diff2 | blobhistory |