Re: [PATCH] [linux-next] Doc: networking: Fix typo in dsa
From: Masanari IidaDate: Sat, 9 Apr 2016 00:00:25 +0900 > This patch fix typos in Documentation/networking/dsa. > > Signed-off-by: Masanari Iida Applied. -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 24/25] arm64:ilp32: add vdso-ilp32 and use for signal return
Hi Bamvor, On Wed, Apr 13, 2016 at 05:19:28PM +0800, Zhangjian (Bamvor) wrote: > Hi, Yury and Philipp > > There is a small fix for this patch. Othervise our tools of living > patch could not work. > > Regards > > Bamvor > > From e05770efca9f040e0039a4a9c4e0d7d3b2bd13e8 Mon Sep 17 00:00:00 2001 > From: Bamvor Jian Zhang> Date: Wed, 13 Apr 2016 15:46:28 +0800 > Subject: [PATCH] arm64: ilp32: do not check vdso-ilp32-offsets.h when ILP32 > disabled > > vdso-ilp32-offsets.h is the dependency of all the arm64-obj-y. And > it does not exist when CONFIG_ARM64_ILP32 is disable which lead to > all the arm64-obj-y are re-built unnecessarily. > > Such rebuild may confuse the sofware(e.g. tools of living patch) > which need to know exactly which file(s) is(are) updated. > > This patch fix this issue by adding the config checker. It looks reasonable and correct. I'll apply your patch in next submission (if it will be needed), otherwise I think, Arnd may apply it. Though, I don't understand much, what 'tools of living patch' means. Could you explain in details what you do, and what goes wrong? Nevertheless, thank you for your attention to this patchset. Yury. > > Signed-off-by: Bamvor Jian Zhang > --- > arch/arm64/kernel/Makefile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile > index b43ff12..0f27a10 100644 > --- a/arch/arm64/kernel/Makefile > +++ b/arch/arm64/kernel/Makefile > @@ -60,5 +60,7 @@ $(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h > $(obj)/vdso/vdso-offsets.h: $(obj)/vdso > > # vDSO - this must be built first to generate the symbol offsets > +ifeq ($(CONFIG_ARM64_ILP32),y) > $(call objectify,$(arm64-obj-y)): $(obj)/vdso-ilp32/vdso-ilp32-offsets.h > $(obj)/vdso-ilp32/vdso-ilp32-offsets.h: $(obj)/vdso-ilp32 > +endif > -- > 1.8.4.5 > > On 2016/4/6 6:08, Yury Norov wrote: > >From: Philipp Tomsich > > > >ILP32 VDSO exports next symbols: > > __kernel_rt_sigreturn; > > __kernel_gettimeofday; > > __kernel_clock_gettime; > > __kernel_clock_getres; > > > >What shared object to use, kernel selects depending on result of > >is_ilp32_compat_task() in arch/arm64/kernel/vdso.c, so it substitutes > >correct pages and spec. > > > >Adjusted to move the move data page before code pages in sync with > >commit 601255ae3c98fd3a8bb4696425e4f868b4f1 > > > >Signed-off-by: Philipp Tomsich > >Signed-off-by: Christoph Muellner > >Signed-off-by: Yury Norov > >--- > > arch/arm64/include/asm/vdso.h | 6 ++ > > arch/arm64/kernel/Makefile| 5 ++ > > arch/arm64/kernel/signal.c| 2 + > > arch/arm64/kernel/vdso-ilp32/.gitignore | 2 + > > arch/arm64/kernel/vdso-ilp32/Makefile | 72 > > arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S | 33 ++ > > arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S | 95 > > +++ > > arch/arm64/kernel/vdso.c | 61 ++--- > > 8 files changed, 266 insertions(+), 10 deletions(-) > > create mode 100644 arch/arm64/kernel/vdso-ilp32/.gitignore > > create mode 100644 arch/arm64/kernel/vdso-ilp32/Makefile > > create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S > > create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S > > > >diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h > >index 839ce00..649a9a4 100644 > >--- a/arch/arm64/include/asm/vdso.h > >+++ b/arch/arm64/include/asm/vdso.h > >@@ -29,6 +29,12 @@ > > > > #include > > > >+#ifdef CONFIG_ARM64_ILP32 > >+#include > >+#else > >+#define vdso_offset_sigtramp_ilp32 > >+#endif > >+ > > #define VDSO_SYMBOL(base, name) > >\ > > ({\ > > (void *)(vdso_offset_##name - VDSO_LBASE + (unsigned long)(base)); \ > >diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile > >index 09e4373..b43ff12 100644 > >--- a/arch/arm64/kernel/Makefile > >+++ b/arch/arm64/kernel/Makefile > >@@ -50,6 +50,7 @@ arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o > > arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o > > > > obj-y += $(arm64-obj-y) vdso/ > >+obj-$(CONFIG_ARM64_ILP32) += vdso-ilp32/ > > obj-m += $(arm64-obj-m) > > head-y := head.o > > extra-y+= $(head-y) vmlinux.lds > >@@ -57,3 +58,7 @@ extra-y+= $(head-y) > >vmlinux.lds > > # vDSO - this must be built first to generate the symbol offsets > > $(call objectify,$(arm64-obj-y)):
[PATCH] Documentation typo: wrong page flag bit for KPF_HUGE
The correct value 17 can be found later in this document and in the kernel-page-flags.h header (KPF_HUGE). I noticed this while implementing vmprobe's kpageflags support. --- Documentation/vm/pagemap.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/vm/pagemap.txt b/Documentation/vm/pagemap.txt index 0e1e555..eafcefa 100644 --- a/Documentation/vm/pagemap.txt +++ b/Documentation/vm/pagemap.txt @@ -62,7 +62,7 @@ There are four components to pagemap: 14. SWAPBACKED 15. COMPOUND_HEAD 16. COMPOUND_TAIL -16. HUGE +17. HUGE 18. UNEVICTABLE 19. HWPOISON 20. NOPAGE -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 24/25] arm64:ilp32: add vdso-ilp32 and use for signal return
Hi, Yury and Philipp There is a small fix for this patch. Othervise our tools of living patch could not work. Regards Bamvor From e05770efca9f040e0039a4a9c4e0d7d3b2bd13e8 Mon Sep 17 00:00:00 2001 From: Bamvor Jian ZhangDate: Wed, 13 Apr 2016 15:46:28 +0800 Subject: [PATCH] arm64: ilp32: do not check vdso-ilp32-offsets.h when ILP32 disabled vdso-ilp32-offsets.h is the dependency of all the arm64-obj-y. And it does not exist when CONFIG_ARM64_ILP32 is disable which lead to all the arm64-obj-y are re-built unnecessarily. Such rebuild may confuse the sofware(e.g. tools of living patch) which need to know exactly which file(s) is(are) updated. This patch fix this issue by adding the config checker. Signed-off-by: Bamvor Jian Zhang --- arch/arm64/kernel/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index b43ff12..0f27a10 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -60,5 +60,7 @@ $(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h $(obj)/vdso/vdso-offsets.h: $(obj)/vdso # vDSO - this must be built first to generate the symbol offsets +ifeq ($(CONFIG_ARM64_ILP32),y) $(call objectify,$(arm64-obj-y)): $(obj)/vdso-ilp32/vdso-ilp32-offsets.h $(obj)/vdso-ilp32/vdso-ilp32-offsets.h: $(obj)/vdso-ilp32 +endif -- 1.8.4.5 On 2016/4/6 6:08, Yury Norov wrote: From: Philipp Tomsich ILP32 VDSO exports next symbols: __kernel_rt_sigreturn; __kernel_gettimeofday; __kernel_clock_gettime; __kernel_clock_getres; What shared object to use, kernel selects depending on result of is_ilp32_compat_task() in arch/arm64/kernel/vdso.c, so it substitutes correct pages and spec. Adjusted to move the move data page before code pages in sync with commit 601255ae3c98fd3a8bb4696425e4f868b4f1 Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov --- arch/arm64/include/asm/vdso.h | 6 ++ arch/arm64/kernel/Makefile| 5 ++ arch/arm64/kernel/signal.c| 2 + arch/arm64/kernel/vdso-ilp32/.gitignore | 2 + arch/arm64/kernel/vdso-ilp32/Makefile | 72 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S | 33 ++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S | 95 +++ arch/arm64/kernel/vdso.c | 61 ++--- 8 files changed, 266 insertions(+), 10 deletions(-) create mode 100644 arch/arm64/kernel/vdso-ilp32/.gitignore create mode 100644 arch/arm64/kernel/vdso-ilp32/Makefile create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h index 839ce00..649a9a4 100644 --- a/arch/arm64/include/asm/vdso.h +++ b/arch/arm64/include/asm/vdso.h @@ -29,6 +29,12 @@ #include +#ifdef CONFIG_ARM64_ILP32 +#include +#else +#define vdso_offset_sigtramp_ilp32 +#endif + #define VDSO_SYMBOL(base, name) \ ({ \ (void *)(vdso_offset_##name - VDSO_LBASE + (unsigned long)(base)); \ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 09e4373..b43ff12 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -50,6 +50,7 @@ arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o arm64-obj-$(CONFIG_RANDOMIZE_BASE)+= kaslr.o obj-y += $(arm64-obj-y) vdso/ +obj-$(CONFIG_ARM64_ILP32) += vdso-ilp32/ obj-m += $(arm64-obj-m) head-y:= head.o extra-y += $(head-y) vmlinux.lds @@ -57,3 +58,7 @@ extra-y += $(head-y) vmlinux.lds # vDSO - this must be built first to generate the symbol offsets $(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h $(obj)/vdso/vdso-offsets.h: $(obj)/vdso + +# vDSO - this must be built first to generate the symbol offsets +$(call objectify,$(arm64-obj-y)): $(obj)/vdso-ilp32/vdso-ilp32-offsets.h +$(obj)/vdso-ilp32/vdso-ilp32-offsets.h: $(obj)/vdso-ilp32 diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 45bcd96..933cdcf 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -264,6 +264,8 @@ void setup_return(struct pt_regs *regs, struct k_sigaction *ka, if (ka->sa.sa_flags & SA_RESTORER) sigtramp = ka->sa.sa_restorer; + else if (is_ilp32_compat_task()) + sigtramp = VDSO_SYMBOL(current->mm->context.vdso,
Re: [PATCH v5 03/46] backlight: lm3630a_bl: stop messing with the pwm->period field
On Tue, 12 Apr 2016, Thierry Reding wrote: > On Tue, Apr 12, 2016 at 03:16:13PM +0100, Lee Jones wrote: > > On Tue, 12 Apr 2016, Thierry Reding wrote: > > > > > On Wed, Mar 30, 2016 at 10:03:26PM +0200, Boris Brezillon wrote: > > > > pwm->period field is not supposed to be changed by PWM users. The only > > > > ones authorized to change it are the PWM core and PWM drivers. > > > > > > > > Signed-off-by: Boris Brezillon> > > > --- > > > > drivers/video/backlight/lm3630a_bl.c | 3 +-- > > > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > > > Applied, thanks. > > > > Applied? > > You didn't specifically Ack this one, but I presumed that since the > change is essentially the same as for pwm-backlight, and this is another > prerequisite for the remainder of the series it should go in through the > PWM tree as well. If you're taking Backlight patches through a !Backlight tree, you're going to have to send out a pull-request. There are no conflicts currently, so I won't use it right away, but I need it in my arsenal if they do occur. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html