Message ID | 20241001195158.GA4135693@ZenIV (mailing list archive) |
---|---|
State | Awaiting Upstream, archived |
Headers | show |
Series | [1/3] parisc: get rid of private asm/unaligned.h | expand |
On 10/1/24 21:51, Al Viro wrote: > Declarations local to arch/*/kernel/*.c are better off *not* in a public > header - arch/parisc/kernel/unaligned.h is just fine for those > bits. > > With that done parisc asm/unaligned.h is reduced to include > of asm-generic/unaligned.h and can be removed - unaligned.h is in > mandatory-y in include/asm-generic/Kbuild. > > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Helge Deller <deller@gmx.de> Al, I prefer if you could take it through your "for-next" tree, as you offered in your header mail. Thanks! Helge
On Wed, Oct 02, 2024 at 02:57:48AM +0200, Helge Deller wrote: > On 10/1/24 21:51, Al Viro wrote: > > Declarations local to arch/*/kernel/*.c are better off *not* in a public > > header - arch/parisc/kernel/unaligned.h is just fine for those > > bits. > > > > With that done parisc asm/unaligned.h is reduced to include > > of asm-generic/unaligned.h and can be removed - unaligned.h is in > > mandatory-y in include/asm-generic/Kbuild. > > > > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> > > Acked-by: Helge Deller <deller@gmx.de> > > Al, I prefer if you could take it through your "for-next" > tree, as you offered in your header mail. Done; that commit (with your Acked-by) is in #for-next (via #next-unaligned). If Vineet is OK with the arc one, it'll also go there...
Am 2024-10-01 21:51, schrieb Al Viro: > Declarations local to arch/*/kernel/*.c are better off *not* in a > public > header - arch/parisc/kernel/unaligned.h is just fine for those > bits. > > With that done parisc asm/unaligned.h is reduced to include > of asm-generic/unaligned.h and can be removed - unaligned.h is in > mandatory-y in include/asm-generic/Kbuild. > diff --git a/arch/parisc/kernel/unaligned.h > b/arch/parisc/kernel/unaligned.h > new file mode 100644 > index 000000000000..c1aa4b12e284 > --- /dev/null > +++ b/arch/parisc/kernel/unaligned.h > @@ -0,0 +1,3 @@ > +struct pt_regs; > +void handle_unaligned(struct pt_regs *regs); > +int check_unaligned(struct pt_regs *regs); Doesn't that need an include guard? Regards, Eike
diff --git a/arch/parisc/include/asm/unaligned.h b/arch/parisc/include/asm/unaligned.h deleted file mode 100644 index c0621295100d..000000000000 --- a/arch/parisc/include/asm/unaligned.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_PARISC_UNALIGNED_H -#define _ASM_PARISC_UNALIGNED_H - -#include <asm-generic/unaligned.h> - -struct pt_regs; -void handle_unaligned(struct pt_regs *regs); -int check_unaligned(struct pt_regs *regs); - -#endif /* _ASM_PARISC_UNALIGNED_H */ diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 294b0e026c9a..a111d7362d56 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -47,6 +47,8 @@ #include <linux/kgdb.h> #include <linux/kprobes.h> +#include "unaligned.h" + #if defined(CONFIG_LIGHTWEIGHT_SPINLOCK_CHECK) #include <asm/spinlock.h> #endif diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index 3e79e40e361d..99897107d800 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c @@ -15,6 +15,7 @@ #include <asm/unaligned.h> #include <asm/hardirq.h> #include <asm/traps.h> +#include "unaligned.h" /* #define DEBUG_UNALIGNED 1 */ diff --git a/arch/parisc/kernel/unaligned.h b/arch/parisc/kernel/unaligned.h new file mode 100644 index 000000000000..c1aa4b12e284 --- /dev/null +++ b/arch/parisc/kernel/unaligned.h @@ -0,0 +1,3 @@ +struct pt_regs; +void handle_unaligned(struct pt_regs *regs); +int check_unaligned(struct pt_regs *regs);
Declarations local to arch/*/kernel/*.c are better off *not* in a public header - arch/parisc/kernel/unaligned.h is just fine for those bits. With that done parisc asm/unaligned.h is reduced to include of asm-generic/unaligned.h and can be removed - unaligned.h is in mandatory-y in include/asm-generic/Kbuild. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- arch/parisc/include/asm/unaligned.h | 11 ----------- arch/parisc/kernel/traps.c | 2 ++ arch/parisc/kernel/unaligned.c | 1 + arch/parisc/kernel/unaligned.h | 3 +++ 4 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 arch/parisc/include/asm/unaligned.h create mode 100644 arch/parisc/kernel/unaligned.h