diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:24:30 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:24:30 +0200 |
commit | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (patch) | |
tree | 39a93460aa2c6eb8286fbba6c551f95443e175dd /fs | |
parent | Merge branch 'x86/x2apic' into x86/core (diff) | |
parent | percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro (diff) | |
download | linux-d3d0ba7b8fb8f57c33207adcb41f40c176148c03.tar.xz linux-d3d0ba7b8fb8f57c33207adcb41f40c176148c03.zip |
Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
"percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"
into x86/core
Conflicts:
arch/x86/kernel/cpu/common.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions