From 343fb116e1a10333dc2f56eb84f50442ae17119b Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Thu, 21 Nov 2013 14:32:01 -0800 Subject: [PATCH] kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly Remove CONFIG_USE_GENERIC_SMP_HELPERS left by commit 0a06ff068f12 ("kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS"). Change-Id: Ia175f191b675b9bc6b1568233bb2712abc889eee Signed-off-by: Yuanhan Liu Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Git-commit: 044c8d4b15743f6e0a4cb6f2aeb32745a116ebff Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [lkuch@codeaurora.org: resolve trivial merge conflicts] Signed-off-by: Liron Kuch --- net/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index 262ac3287ce9..b9d1e6929cd9 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -235,8 +235,8 @@ source "net/netlink/Kconfig" source "net/rmnet_data/Kconfig" config RPS - boolean "RPS" - depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS + boolean + depends on SMP && SYSFS default y config RFS_ACCEL @@ -247,7 +247,7 @@ config RFS_ACCEL config XPS boolean - depends on SMP && USE_GENERIC_SMP_HELPERS + depends on SMP default y config NETPRIO_CGROUP