Re: [PATCH 05/29] target/iscsi: Remove CONFIG_SMP and if 0 ifdefs

["Nicholas A. Bellinger" <nab@xxxxxxxxxxxxxxx>]

On Tue, 2012-04-03 at 15:51 -0700, Andy Grover wrote:
> Compiles fine with CONFIG_SMP=y or n.
> 
> Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
> ---
>  drivers/target/iscsi/iscsi_target.c |   20 --------------------
>  1 files changed, 0 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
> index 816baba..c9bf158 100644
> --- a/drivers/target/iscsi/iscsi_target.c
> +++ b/drivers/target/iscsi/iscsi_target.c
> @@ -3416,8 +3416,6 @@ static void iscsit_tx_thread_wait_for_tcp(struct iscsi_conn *conn)
>  	}
>  }
>  
> -#ifdef CONFIG_SMP
> -

Mmm, last time I checked on 2.6.x this worked on x86_64, but fails to
compile on arm CONFIG_SMP=n due to missing cpumask_set_cpu() and
set_cpus_allowed_ptr()..

Arnd + Russel (Cc'ed), do you know if this is still the case that we
need CONFIG_SMP here..?

Thanks,

--nab


>  void iscsit_thread_get_cpumask(struct iscsi_conn *conn)
>  {
>  	struct iscsi_thread_set *ts = conn->thread_set;
> @@ -3431,10 +3429,6 @@ void iscsit_thread_get_cpumask(struct iscsi_conn *conn)
>  	 * execute upon.
>  	 */
>  	ord = ts->thread_id % cpumask_weight(cpu_online_mask);
> -#if 0
> -	pr_debug(">>>>>>>>>>>>>>>>>>>> Generated ord: %d from"
> -			" thread_id: %d\n", ord, ts->thread_id);
> -#endif
>  	for_each_online_cpu(cpu) {
>  		if (ord-- == 0) {
>  			cpumask_set_cpu(cpu, conn->conn_cpumask);
> @@ -3474,23 +3468,9 @@ static inline void iscsit_thread_check_cpumask(
>  	 */
>  	memset(buf, 0, 128);
>  	cpumask_scnprintf(buf, 128, conn->conn_cpumask);
> -#if 0
> -	pr_debug(">>>>>>>>>>>>>> Calling set_cpus_allowed_ptr():"
> -			" %s for %s\n", buf, p->comm);
> -#endif
>  	set_cpus_allowed_ptr(p, conn->conn_cpumask);
>  }
>  
> -#else
> -
> -void iscsit_thread_get_cpumask(struct iscsi_conn *conn)
> -{
> -	return;
> -}
> -
> -#define iscsit_thread_check_cpumask(X, Y, Z) ({})
> -#endif /* CONFIG_SMP */
> -
>  int iscsi_target_tx_thread(void *arg)
>  {
>  	u8 state;


--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html