queue-4.4/s390-cio-fix-cio_irb-declaration.patch

   1 From 39ac0e0d8f05ca344c24f76e36508970eecdfd9b Mon Sep 17 00:00:00 2001
   2 From: Arnd Bergmann <arnd@arndb.de>
   3 Date: Mon, 8 Apr 2019 23:26:20 +0200
   4 Subject: s390: cio: fix cio_irb declaration
   5
   6 [ Upstream commit e91012ee855ad9f5ef2ab106a3de51db93fe4d0c ]
   7
   8 clang points out that the declaration of cio_irb does not match the
   9 definition exactly, it is missing the alignment attribute:
  10
  11 ../drivers/s390/cio/cio.c:50:1: warning: section does not match previous declaration [-Wsection]
  12 DEFINE_PER_CPU_ALIGNED(struct irb, cio_irb);
  13 ^
  14 ../include/linux/percpu-defs.h:150:2: note: expanded from macro 'DEFINE_PER_CPU_ALIGNED'
  15         DEFINE_PER_CPU_SECTION(type, name, PER_CPU_ALIGNED_SECTION)     \
  16         ^
  17 ../include/linux/percpu-defs.h:93:9: note: expanded from macro 'DEFINE_PER_CPU_SECTION'
  18         extern __PCPU_ATTRS(sec) __typeof__(type) name;                 \
  19                ^
  20 ../include/linux/percpu-defs.h:49:26: note: expanded from macro '__PCPU_ATTRS'
  21         __percpu __attribute__((section(PER_CPU_BASE_SECTION sec)))     \
  22                                 ^
  23 ../drivers/s390/cio/cio.h:118:1: note: previous attribute is here
  24 DECLARE_PER_CPU(struct irb, cio_irb);
  25 ^
  26 ../include/linux/percpu-defs.h:111:2: note: expanded from macro 'DECLARE_PER_CPU'
  27         DECLARE_PER_CPU_SECTION(type, name, "")
  28         ^
  29 ../include/linux/percpu-defs.h:87:9: note: expanded from macro 'DECLARE_PER_CPU_SECTION'
  30         extern __PCPU_ATTRS(sec) __typeof__(type) name
  31                ^
  32 ../include/linux/percpu-defs.h:49:26: note: expanded from macro '__PCPU_ATTRS'
  33         __percpu __attribute__((section(PER_CPU_BASE_SECTION sec)))     \
  34                                 ^
  35 Use DECLARE_PER_CPU_ALIGNED() here, to make the two match.
  36
  37 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  38 Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
  39 Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
  40 Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  41 Signed-off-by: Sasha Levin <sashal@kernel.org>
  42 ---
  43  drivers/s390/cio/cio.h | 2 +-
  44  1 file changed, 1 insertion(+), 1 deletion(-)
  45
  46 diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
  47 index a01376ae17493..fdb87520543fe 100644
  48 --- a/drivers/s390/cio/cio.h
  49 +++ b/drivers/s390/cio/cio.h
  50 @@ -102,7 +102,7 @@ struct subchannel {
  51         struct schib_config config;
  52  } __attribute__ ((aligned(8)));
  53
  54 -DECLARE_PER_CPU(struct irb, cio_irb);
  55 +DECLARE_PER_CPU_ALIGNED(struct irb, cio_irb);
  56
  57  #define to_subchannel(n) container_of(n, struct subchannel, dev)
  58
  59 --
  60 2.20.1
  61