Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 044c8d4b authored by Yuanhan Liu's avatar Yuanhan Liu Committed by Linus Torvalds
Browse files

kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly 



Remove CONFIG_USE_GENERIC_SMP_HELPERS left by commit 0a06ff06
("kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS").

Signed-off-by: default avatarYuanhan Liu <yuanhan.liu@linux.intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a399b29d

drivers/block/null_blk.c

+4 −4
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void null_softirq_done_fn(struct request *rq) 
	blk_end_request_all(rq, 0);

}



#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS)

#ifdef CONFIG_SMP



static void null_ipi_cmd_end_io(void *data)

{
@@ -260,7 +260,7 @@ static void null_cmd_end_ipi(struct nullb_cmd *cmd) 
	put_cpu();

}



#endif /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */

#endif /* CONFIG_SMP */



static inline void null_handle_cmd(struct nullb_cmd *cmd)

{
@@ -270,7 +270,7 @@ static inline void null_handle_cmd(struct nullb_cmd *cmd) 
		end_cmd(cmd);

		break;

	case NULL_IRQ_SOFTIRQ:

#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS)

#ifdef CONFIG_SMP

		null_cmd_end_ipi(cmd);

#else

		end_cmd(cmd);
@@ -571,7 +571,7 @@ static int __init null_init(void) 
{

	unsigned int i;



#if !defined(CONFIG_SMP) || !defined(CONFIG_USE_GENERIC_SMP_HELPERS)

#if !defined(CONFIG_SMP)

	if (irqmode == NULL_IRQ_SOFTIRQ) {

		pr_warn("null_blk: softirq completions not available.\n");

		pr_warn("null_blk: using direct completions.\n");

net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ source "net/hsr/Kconfig" 


config RPS

	boolean

	depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS

	depends on SMP && SYSFS

	default y



config RFS_ACCEL
@@ -235,7 +235,7 @@ config RFS_ACCEL 


config XPS

	boolean

	depends on SMP && USE_GENERIC_SMP_HELPERS

	depends on SMP

	default y



config NETPRIO_CGROUP