diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:07:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:07:57 -0500 |
| commit | be9c5ae4eeec2e85527e95647348b8ea4eb25128 (patch) | |
| tree | 59383b15bc0891b8a44500a0ac172a8850f1068d /arch/x86/configs/i386_defconfig | |
| parent | bb26c6c29b7cc9f39e491b074b09f3c284738d36 (diff) | |
| parent | 79a66b96c339626a3e4b226fefc0e45244cfe6ff (diff) | |
Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (246 commits)
x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
x86: PAT: fix address types in track_pfn_vma_new()
x86: prioritize the FPU traps for the error code
x86: PAT: pfnmap documentation update changes
x86: PAT: move track untrack pfnmap stubs to asm-generic
x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
x86: PAT: modify follow_phys to return phys_addr prot and return value
x86: PAT: clarify is_linear_pfn_mapping() interface
x86: ia32_signal: remove unnecessary declaration
x86: common.c boot_cpu_stack and boot_exception_stacks should be static
x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
x86: fix warning in arch/x86/kernel/microcode_amd.c
x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
x86: asm-offset_64: use rt_sigframe_ia32
x86: sigframe.h: include headers for dependency
x86: traps.c declare functions before they get used
x86: PAT: update documentation to cover pgprot and remap_pfn related changes - v3
x86: PAT: add pgprot_writecombine() interface for drivers - v3
x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
...
Diffstat (limited to 'arch/x86/configs/i386_defconfig')
| -rw-r--r-- | arch/x86/configs/i386_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 13b8c86ae985..b30a08ed8eb4 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
| @@ -77,7 +77,7 @@ CONFIG_AUDIT=y | |||
| 77 | CONFIG_AUDITSYSCALL=y | 77 | CONFIG_AUDITSYSCALL=y |
| 78 | CONFIG_AUDIT_TREE=y | 78 | CONFIG_AUDIT_TREE=y |
| 79 | # CONFIG_IKCONFIG is not set | 79 | # CONFIG_IKCONFIG is not set |
| 80 | CONFIG_LOG_BUF_SHIFT=17 | 80 | CONFIG_LOG_BUF_SHIFT=18 |
| 81 | CONFIG_CGROUPS=y | 81 | CONFIG_CGROUPS=y |
| 82 | # CONFIG_CGROUP_DEBUG is not set | 82 | # CONFIG_CGROUP_DEBUG is not set |
| 83 | CONFIG_CGROUP_NS=y | 83 | CONFIG_CGROUP_NS=y |
| @@ -298,7 +298,7 @@ CONFIG_KEXEC=y | |||
| 298 | CONFIG_CRASH_DUMP=y | 298 | CONFIG_CRASH_DUMP=y |
| 299 | # CONFIG_KEXEC_JUMP is not set | 299 | # CONFIG_KEXEC_JUMP is not set |
| 300 | CONFIG_PHYSICAL_START=0x1000000 | 300 | CONFIG_PHYSICAL_START=0x1000000 |
| 301 | CONFIG_RELOCATABLE=y | 301 | # CONFIG_RELOCATABLE is not set |
| 302 | CONFIG_PHYSICAL_ALIGN=0x200000 | 302 | CONFIG_PHYSICAL_ALIGN=0x200000 |
| 303 | CONFIG_HOTPLUG_CPU=y | 303 | CONFIG_HOTPLUG_CPU=y |
| 304 | # CONFIG_COMPAT_VDSO is not set | 304 | # CONFIG_COMPAT_VDSO is not set |