diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-18 18:48:48 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-18 18:48:48 -0400 |
| commit | 2f4ee2d18a942e5c7ebfb4e0a9de64dd84948adb (patch) | |
| tree | 6380f79a879d7beadb8d60a9cad90b4d9842b4a6 /arch/arm/kernel/setup.c | |
| parent | 3a5c3743f15f27237ab025736a981e2d0c9fdfed (diff) | |
| parent | 07f1c295de593ec0b0dca3092299c048c03374da (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into linaro-3.0
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index acbb447ac6b..f59653d6765 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -918,6 +918,12 @@ void __init setup_arch(char **cmdline_p) cpu_init(); tcm_init(); +#ifdef CONFIG_ZONE_DMA + if (mdesc->dma_zone_size) { + extern unsigned long arm_dma_zone_size; + arm_dma_zone_size = mdesc->dma_zone_size; + } +#endif #ifdef CONFIG_MULTI_IRQ_HANDLER handle_arch_irq = mdesc->handle_irq; #endif @@ -979,6 +985,10 @@ static const char *hwcap_str[] = { "neon", "vfpv3", "vfpv3d16", + "tls", + "vfpv4", + "idiva", + "idivt", NULL }; |