diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 19:48:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 19:48:53 -0500 |
| commit | 6232665040f9a23fafd9d94d4ae8d5a2dc850f65 (patch) | |
| tree | 21ee1b178d0f96ad9f4932e4da8abccf2fbeae96 /arch/powerpc | |
| parent | 94ed294c20ef07fffa40817c68155fba35dd67f1 (diff) | |
| parent | c18d1250c7425dddd2633ce4eaf03d5015e68a0f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
alpha: fix x86.git merge build error
ia64: on UP percpu variables are not small memory model
x86: fix arch/x86/kernel/test_nx.c modular build bug
s390: use generic percpu linux-2.6.git
POWERPC: use generic per cpu
ia64: use generic percpu
SPARC64: use generic percpu
percpu: change Kconfig to HAVE_SETUP_PER_CPU_AREA
modules: fold percpu_modcopy into module.c
x86: export copy_from_user_ll_nocache[_nozero]
x86: fix duplicated TIF on 64-bit
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index fb85f6b72fcf..bb16443b6817 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -42,7 +42,7 @@ config GENERIC_HARDIRQS | |||
| 42 | bool | 42 | bool |
| 43 | default y | 43 | default y |
| 44 | 44 | ||
| 45 | config ARCH_SETS_UP_PER_CPU_AREA | 45 | config HAVE_SETUP_PER_CPU_AREA |
| 46 | def_bool PPC64 | 46 | def_bool PPC64 |
| 47 | 47 | ||
| 48 | config IRQ_PER_CPU | 48 | config IRQ_PER_CPU |