diff mbox

mmotm 2018-07-13-16-51 uploaded (PSI)

Message ID 20180714124728.562ff3af@canb.auug.org.au (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Rothwell July 14, 2018, 2:47 a.m. UTC 
Hi all,

On Fri, 13 Jul 2018 18:41:40 -0700 Randy Dunlap <rdunlap@infradead.org> wrote:
>
> On 07/13/2018 04:51 PM, akpm@linux-foundation.org wrote:
> > The mm-of-the-moment snapshot 2018-07-13-16-51 has been uploaded to
> > 
> >    http://www.ozlabs.org/~akpm/mmotm/
> > 
> > mmotm-readme.txt says
> > 
> > README for mm-of-the-moment:
> > 
> > http://www.ozlabs.org/~akpm/mmotm/
> > 
> > This is a snapshot of my -mm patch queue.  Uploaded at random hopefully
> > more than once a week.
> > 
> > You will need quilt to apply these patches to the latest Linus release (4.x
> > or 4.x-rcY).  The series file is in broken-out.tar.gz and is duplicated in
> > http://ozlabs.org/~akpm/mmotm/series
> > 
> > The file broken-out.tar.gz contains two datestamp files: .DATE and
> > .DATE-yyyy-mm-dd-hh-mm-ss.  Both contain the string yyyy-mm-dd-hh-mm-ss,
> > followed by the base kernel version against which this patch series is to
> > be applied.  
> 
> 
> ../include/linux/psi.h:12:13: error: conflicting types for 'psi_disabled'
> extern bool psi_disabled;
> 
> 
> choose one:)
> 
> kernel/sched/psi.c:
> bool psi_disabled __read_mostly;
> 
> 
> include/linux/sched/stat.h:
> 	extern int psi_disabled;

I have added this to linux-next (in case Andrew doesn't have time to
revise mmotm):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 14 Jul 2018 12:35:19 +1000
Subject: [PATCH]  psi-pressure-stall-information-for-cpu-memory-and-io-fix-fix-fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/sched/stat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/include/linux/sched/stat.h b/include/linux/sched/stat.h
index ac39435d1521..bd477b819237 100644
--- a/include/linux/sched/stat.h
+++ b/include/linux/sched/stat.h
@@ -31,7 +31,7 @@  static inline int sched_info_on(void)
 	if (delayacct_on)
 		return 1;
 #elif defined(CONFIG_PSI)
-	extern int psi_disabled;
+	extern bool psi_disabled;
 	if (!psi_disabled)
 		return 1;
 #endif