diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-01-14 00:25:04 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-01-14 00:25:04 +0400 |
commit | c6888135eeff1b3096607970357124605bda1041 (patch) | |
tree | c8381098ccf4506e32feddda51bb94386e0f777e /arch/ia64 | |
parent | 2df89c3410d1f4bb93500520e00e30bd3689004e (diff) | |
parent | cf2f6290d0f9a94bc309a74f5500f7be144c0d36 (diff) |
Merge branch 'tracking-big-LITTLE-MP-master-v14' into merge-linux-linaro-core-tracking
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/include/asm/topology.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index a2496e449b7..6d0b61741c1 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h @@ -65,6 +65,7 @@ void build_cpu_to_node_map(void); | SD_BALANCE_EXEC \ | SD_BALANCE_FORK \ | SD_WAKE_AFFINE, \ + | arch_sd_local_flags(0)\ .last_balance = jiffies, \ .balance_interval = 1, \ .nr_balance_failed = 0, \ |