diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-13 12:31:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-13 12:31:39 +0000 |
| commit | 492df0b1349d54c0b5b26f254d4c1e73a44ab728 (patch) | |
| tree | 1fc150dcc43812b0e0026e14c4ca41927d75286e | |
| parent | 78157f5f8cde58d3c552ad6f0ad65118a92e3529 (diff) | |
| parent | 32af9f3d6cc820c0c0a734666d1e0c73ce063833 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
| -rw-r--r-- | arch/arm64/Kconfig | 16 | ||||
| -rw-r--r-- | arch/arm64/kernel/setup.c | 5 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 3 |
3 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a275ec3f743..b0cfc46ae97 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -152,6 +152,22 @@ config ARM_CPU_TOPOLOGY Support CPU topology definition, based on configuration provided by the firmware. +config SCHED_MC + bool "Multi-core scheduler support" + depends on ARM_CPU_TOPOLOGY + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + +config SCHED_SMT + bool "SMT scheduler support" + depends on ARM_CPU_TOPOLOGY + help + Improves the CPU scheduler's decision making when dealing with + MultiThreading at a cost of slightly increased overhead in some + places. If unsure say N here. + config NR_CPUS int "Maximum number of CPUs (2-32)" range 2 32 diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 3dc5c2f7c6b..85afdae9cc0 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -98,6 +98,11 @@ void __init early_print(const char *str, ...) printk("%s", buf); } +bool arch_match_cpu_phys_id(int cpu, u64 phys_id) +{ + return phys_id == cpu_logical_map(cpu); +} + static void __init setup_processor(void) { struct cpu_info *cpu_info; diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 50f7afe5655..bff23d33d66 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -319,7 +319,8 @@ config FB_PM2_FIFO_DISCONNECT config FB_ARMCLCD tristate "ARM PrimeCell PL110 support" - depends on FB && ARM && ARM_AMBA + depends on ARM || ARM64 || COMPILE_TEST + depends on FB && ARM_AMBA select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT |