diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-12 16:18:43 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-13 04:14:38 -0500 |
| commit | b5932cc839d809a07a43b93555ccc3fbabc2a766 (patch) | |
| tree | 528d7a0b3353c08ec7461dee80d7d3151061dc07 /arch/arm64/include/asm/processor.h | |
| parent | a5434fc9e2ad9bac545f058a24b284c051a1faae (diff) | |
| parent | 16cf8a80a8f0f4757427b17cdfb6c4897674db68 (diff) | |
Merge branch 'cleanups/dma' into next/cleanup
Separate patches from Marek Szyprowski <m.szyprowski@samsung.com>:
Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
region") replaced custom consistent memory handling, so setting
consistent dma memory size is not longer required. This patch series
cleans sub-architecture platform code to remove all calls to the
obsolated init_consistent_dma_size() function and finally removes the
init_consistent_dma_size() stub itself.
* cleanups/dma:
ARM: at91: remove obsoleted init_consistent_dma_size()
ARM: u300: remove obsoleted init_consistent_dma_size()
ARM: dma-mapping: remove init_consistent_dma_size() stub
ARM: shmobile: remove obsoleted init_consistent_dma_size()
ARM: davinci: remove obsoleted init_consistent_dma_size()
ARM: samsung: remove obsoleted init_consistent_dma_size()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/include/asm/processor.h')
| -rw-r--r-- | arch/arm64/include/asm/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 5d810044feda..77f696c14339 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h | |||
| @@ -43,6 +43,8 @@ | |||
| 43 | #else | 43 | #else |
| 44 | #define STACK_TOP STACK_TOP_MAX | 44 | #define STACK_TOP STACK_TOP_MAX |
| 45 | #endif /* CONFIG_COMPAT */ | 45 | #endif /* CONFIG_COMPAT */ |
| 46 | |||
| 47 | #define ARCH_LOW_ADDRESS_LIMIT PHYS_MASK | ||
| 46 | #endif /* __KERNEL__ */ | 48 | #endif /* __KERNEL__ */ |
| 47 | 49 | ||
| 48 | struct debug_info { | 50 | struct debug_info { |
