diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
| commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
| tree | bf66ccdd613019035ebab535762366aa1026399b /arch/powerpc/Kconfig | |
| parent | d7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff) | |
| parent | b5c42bc8db17db80917f99205a03c51f17354495 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 7b67895fccf6..ff755398ce28 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -872,6 +872,18 @@ config TASK_SIZE | |||
| 872 | default "0x80000000" if PPC_PREP || PPC_8xx | 872 | default "0x80000000" if PPC_PREP || PPC_8xx |
| 873 | default "0xc0000000" | 873 | default "0xc0000000" |
| 874 | 874 | ||
| 875 | config CONSISTENT_SIZE_BOOL | ||
| 876 | bool "Set custom consistent memory pool size" | ||
| 877 | depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE | ||
| 878 | help | ||
| 879 | This option allows you to set the size of the | ||
| 880 | consistent memory pool. This pool of virtual memory | ||
| 881 | is used to make consistent memory allocations. | ||
| 882 | |||
| 883 | config CONSISTENT_SIZE | ||
| 884 | hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL | ||
| 885 | default "0x00200000" if NOT_COHERENT_CACHE | ||
| 886 | |||
| 875 | config PIN_TLB | 887 | config PIN_TLB |
| 876 | bool "Pinned Kernel TLBs (860 ONLY)" | 888 | bool "Pinned Kernel TLBs (860 ONLY)" |
| 877 | depends on ADVANCED_OPTIONS && 8xx | 889 | depends on ADVANCED_OPTIONS && 8xx |