aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 08:49:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 08:49:52 -0800
commit341031caec0cd730e84d248d95851bf54ec4e41f (patch)
treef9531f3bef8446e0eb2f9f4ba1ed6fa1000585c8 /include
parent836f48c5f8c6ef004419f1605514aa05eb58eefb (diff)
parent6d558c3ac9b6508d26fd5cadccce51fc9d726b1c (diff)
downloadmrst-s0i3-test-341031caec0cd730e84d248d95851bf54ec4e41f.tar.gz
mrst-s0i3-test-341031caec0cd730e84d248d95851bf54ec4e41f.tar.xz
mrst-s0i3-test-341031caec0cd730e84d248d95851bf54ec4e41f.zip
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Reassign prev and switch_count when reacquire_kernel_lock() fail sched: Fix vmark regression on big machines
Diffstat (limited to 'include')
-rw-r--r--include/linux/topology.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h
index 57e63579bfd..5b81156780b 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -99,7 +99,7 @@ int arch_update_cpu_topology(void);
| 1*SD_WAKE_AFFINE \
| 1*SD_SHARE_CPUPOWER \
| 0*SD_POWERSAVINGS_BALANCE \
- | 0*SD_SHARE_PKG_RESOURCES \
+ | 1*SD_SHARE_PKG_RESOURCES \
| 0*SD_SERIALIZE \
| 0*SD_PREFER_SIBLING \
, \