| Message ID | 5e7c366e68844a0fe8e18371c5a76aef53905fae.1604333009.git.andreyknvl@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kasan: add hardware tag-based mode for arm64 | expand |
On Mon, Nov 2, 2020 at 5:04 PM Andrey Konovalov <andreyknvl@google.com> wrote: > > asm/kasan.h relies on pgd_t type that is defined in asm/page.h. Include > asm/page.h from asm/kasan.h. > > Signed-off-by: Andrey Konovalov <andreyknvl@google.com> > --- > Change-Id: I369a8f9beb442b9d05733892232345c3f4120e0a > --- > arch/s390/include/asm/kasan.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/s390/include/asm/kasan.h b/arch/s390/include/asm/kasan.h > index e9bf486de136..a0ea4158858b 100644 > --- a/arch/s390/include/asm/kasan.h > +++ b/arch/s390/include/asm/kasan.h > @@ -2,6 +2,8 @@ > #ifndef __ASM_KASAN_H > #define __ASM_KASAN_H > > +#include <asm/page.h> > + > #ifdef CONFIG_KASAN > > #define KASAN_SHADOW_SCALE_SHIFT 3 > -- > 2.29.1.341.ge80a0c044ae-goog > Hi Vasily, Could you give your ack on this patch? The full series is here: https://lore.kernel.org/linux-arm-kernel/cover.1604333009.git.andreyknvl@google.com/ Thanks!
On Mon, Nov 02, 2020 at 05:03:53PM +0100, Andrey Konovalov wrote: > asm/kasan.h relies on pgd_t type that is defined in asm/page.h. Include > asm/page.h from asm/kasan.h. > > Signed-off-by: Andrey Konovalov <andreyknvl@google.com> > --- > Change-Id: I369a8f9beb442b9d05733892232345c3f4120e0a > --- > arch/s390/include/asm/kasan.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/s390/include/asm/kasan.h b/arch/s390/include/asm/kasan.h > index e9bf486de136..a0ea4158858b 100644 > --- a/arch/s390/include/asm/kasan.h > +++ b/arch/s390/include/asm/kasan.h > @@ -2,6 +2,8 @@ > #ifndef __ASM_KASAN_H > #define __ASM_KASAN_H > > +#include <asm/page.h> Could you please include #include <asm/pgtable.h> instead? This file is also using _REGION1_SHIFT which is defined there. And I have some s390 kasan changes pending, which include asm/pgtable.h as well, so this would make merging simpler. Thank you. With that changed Acked-by: Vasily Gorbik <gor@linux.ibm.com> > + > #ifdef CONFIG_KASAN > > #define KASAN_SHADOW_SCALE_SHIFT 3
On Wed, Nov 4, 2020 at 8:25 PM Vasily Gorbik <gor@linux.ibm.com> wrote: > > On Mon, Nov 02, 2020 at 05:03:53PM +0100, Andrey Konovalov wrote: > > asm/kasan.h relies on pgd_t type that is defined in asm/page.h. Include > > asm/page.h from asm/kasan.h. > > > > Signed-off-by: Andrey Konovalov <andreyknvl@google.com> > > --- > > Change-Id: I369a8f9beb442b9d05733892232345c3f4120e0a > > --- > > arch/s390/include/asm/kasan.h | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/arch/s390/include/asm/kasan.h b/arch/s390/include/asm/kasan.h > > index e9bf486de136..a0ea4158858b 100644 > > --- a/arch/s390/include/asm/kasan.h > > +++ b/arch/s390/include/asm/kasan.h > > @@ -2,6 +2,8 @@ > > #ifndef __ASM_KASAN_H > > #define __ASM_KASAN_H > > > > +#include <asm/page.h> > > Could you please include > #include <asm/pgtable.h> > > instead? This file is also using _REGION1_SHIFT which is defined there. > And I have some s390 kasan changes pending, which include > asm/pgtable.h as well, so this would make merging simpler. Thank you. > > With that changed > Acked-by: Vasily Gorbik <gor@linux.ibm.com> No problem, thank you!
diff --git a/arch/s390/include/asm/kasan.h b/arch/s390/include/asm/kasan.h index e9bf486de136..a0ea4158858b 100644 --- a/arch/s390/include/asm/kasan.h +++ b/arch/s390/include/asm/kasan.h @@ -2,6 +2,8 @@ #ifndef __ASM_KASAN_H #define __ASM_KASAN_H +#include <asm/page.h> + #ifdef CONFIG_KASAN #define KASAN_SHADOW_SCALE_SHIFT 3
asm/kasan.h relies on pgd_t type that is defined in asm/page.h. Include asm/page.h from asm/kasan.h. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- Change-Id: I369a8f9beb442b9d05733892232345c3f4120e0a --- arch/s390/include/asm/kasan.h | 2 ++ 1 file changed, 2 insertions(+)