sched: typo: remove space in #ifdef

Message ID 1518512382-29426-1-git-send-email-vincent.guittot@linaro.org
State Accepted
Commit 387f77cc8249c847b4fa4d8c93694818b79efee3
Headers show
Series
  • sched: typo: remove space in #ifdef
Related show

Commit Message

Vincent Guittot Feb. 13, 2018, 8:59 a.m.
Remove a useless space in # ifdef and align it with others

Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>

---
 kernel/sched/fair.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.7.4

Comments

Peter Zijlstra Feb. 13, 2018, 9:05 a.m. | #1
On Tue, Feb 13, 2018 at 09:59:42AM +0100, Vincent Guittot wrote:
> Remove a useless space in # ifdef and align it with others

> 

> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>

> ---

>  kernel/sched/fair.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c

> index 1070803..cad1932 100644

> --- a/kernel/sched/fair.c

> +++ b/kernel/sched/fair.c

> @@ -2823,7 +2823,7 @@ void reweight_task(struct task_struct *p, int prio)

>  }

>  

>  #ifdef CONFIG_FAIR_GROUP_SCHED

> -# ifdef CONFIG_SMP

> +#ifdef CONFIG_SMP


Heh, so this is one where Ingo and me disagree ;-) He likes that
indented preprocessor nonsense, whereas I just find it really
bothersome.

I try and hide these in patches that touch the surrounding code.
Ingo Molnar Feb. 13, 2018, 9:31 a.m. | #2
* Peter Zijlstra <peterz@infradead.org> wrote:

> On Tue, Feb 13, 2018 at 09:59:42AM +0100, Vincent Guittot wrote:

> > Remove a useless space in # ifdef and align it with others

> > 

> > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>

> > ---

> >  kernel/sched/fair.c | 4 ++--

> >  1 file changed, 2 insertions(+), 2 deletions(-)

> > 

> > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c

> > index 1070803..cad1932 100644

> > --- a/kernel/sched/fair.c

> > +++ b/kernel/sched/fair.c

> > @@ -2823,7 +2823,7 @@ void reweight_task(struct task_struct *p, int prio)

> >  }

> >  

> >  #ifdef CONFIG_FAIR_GROUP_SCHED

> > -# ifdef CONFIG_SMP

> > +#ifdef CONFIG_SMP

> 

> Heh, so this is one where Ingo and me disagree ;-)


In this particular case I agree with you.

> He likes that indented preprocessor nonsense, whereas I just find it really 

> bothersome.


Here it's bothersome, because the #ifdef block is long.

It's actually a big improvement in other places:

#ifdef CONFIG_EFI_STUB
# ifdef CONFIG_EFI_MIXED
#  define XLF23 (XLF_EFI_HANDOVER_32|XLF_EFI_HANDOVER_64)
# else
#  ifdef CONFIG_X86_64
#   define XLF23 XLF_EFI_HANDOVER_64            /* 64-bit EFI handover ok */
#  else
#   define XLF23 XLF_EFI_HANDOVER_32            /* 32-bit EFI handover ok */
#  endif
# endif
#else
# define XLF23 0
#endif

Which is a _LOT_ more structured and easier to read than:

#ifdef CONFIG_EFI_STUB
#ifdef CONFIG_EFI_MIXED
#define XLF23 (XLF_EFI_HANDOVER_32|XLF_EFI_HANDOVER_64)
#else
#ifdef CONFIG_X86_64
#define XLF23 XLF_EFI_HANDOVER_64            /* 64-bit EFI handover ok */
#else
#define XLF23 XLF_EFI_HANDOVER_32            /* 32-bit EFI handover ok */
#endif
#endif
#else
#define XLF23 0
#endif

Thanks,

	Ingo

Patch

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 1070803..cad1932 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2823,7 +2823,7 @@  void reweight_task(struct task_struct *p, int prio)
 }
 
 #ifdef CONFIG_FAIR_GROUP_SCHED
-# ifdef CONFIG_SMP
+#ifdef CONFIG_SMP
 /*
  * All this does is approximate the hierarchical proportion which includes that
  * global sum we all love to hate.
@@ -2974,7 +2974,7 @@  static long calc_group_runnable(struct cfs_rq *cfs_rq, long shares)
 
 	return clamp_t(long, runnable, MIN_SHARES, shares);
 }
-# endif /* CONFIG_SMP */
+#endif /* CONFIG_SMP */
 
 static inline int throttled_hierarchy(struct cfs_rq *cfs_rq);