diff mbox series

riscv: Drop a duplicated PAGE_KERNEL_EXEC

Message ID 20201111115216.31447-1-wangkefeng.wang@huawei.com (mailing list archive)
State New, archived
Headers show
Series riscv: Drop a duplicated PAGE_KERNEL_EXEC | expand

Commit Message

Kefeng Wang Nov. 11, 2020, 11:52 a.m. UTC
commit b91540d52a08 ("RISC-V: Add EFI runtime services") add
a duplicated PAGE_KERNEL_EXEC, kill it.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 arch/riscv/include/asm/pgtable.h | 1 -
 1 file changed, 1 deletion(-)

Comments

Pekka Enberg Nov. 11, 2020, 12:34 p.m. UTC | #1
On Wed, Nov 11, 2020 at 1:47 PM Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>
> commit b91540d52a08 ("RISC-V: Add EFI runtime services") add
> a duplicated PAGE_KERNEL_EXEC, kill it.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>

Reviewed-by: Pekka Enberg <penberg@kernel.org>

> ---
>  arch/riscv/include/asm/pgtable.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 183f1f4b2ae6..73e8b5e5bb65 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -99,7 +99,6 @@
>                                 | _PAGE_DIRTY)
>
>  #define PAGE_KERNEL            __pgprot(_PAGE_KERNEL)
> -#define PAGE_KERNEL_EXEC       __pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>  #define PAGE_KERNEL_READ       __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
>  #define PAGE_KERNEL_EXEC       __pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>  #define PAGE_KERNEL_READ_EXEC  __pgprot((_PAGE_KERNEL & ~_PAGE_WRITE) \
> --
> 2.26.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
Atish Patra Nov. 12, 2020, 7:26 a.m. UTC | #2
On Wed, Nov 11, 2020 at 3:47 AM Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>
> commit b91540d52a08 ("RISC-V: Add EFI runtime services") add
> a duplicated PAGE_KERNEL_EXEC, kill it.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
>  arch/riscv/include/asm/pgtable.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 183f1f4b2ae6..73e8b5e5bb65 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -99,7 +99,6 @@
>                                 | _PAGE_DIRTY)
>
>  #define PAGE_KERNEL            __pgprot(_PAGE_KERNEL)
> -#define PAGE_KERNEL_EXEC       __pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>  #define PAGE_KERNEL_READ       __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
>  #define PAGE_KERNEL_EXEC       __pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>  #define PAGE_KERNEL_READ_EXEC  __pgprot((_PAGE_KERNEL & ~_PAGE_WRITE) \
> --
> 2.26.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Apologies for the oversight. Thanks for the quick fix :).

Reviewed-by: Atish Patra <atish.patra@wdc.com>
Kefeng Wang Dec. 14, 2020, 11:30 a.m. UTC | #3
Hi Palmer,  kindly ping..

On 2020/11/11 19:52, Kefeng Wang wrote:
> commit b91540d52a08 ("RISC-V: Add EFI runtime services") add
> a duplicated PAGE_KERNEL_EXEC, kill it.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
>   arch/riscv/include/asm/pgtable.h | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 183f1f4b2ae6..73e8b5e5bb65 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -99,7 +99,6 @@
>   				| _PAGE_DIRTY)
>   
>   #define PAGE_KERNEL		__pgprot(_PAGE_KERNEL)
> -#define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>   #define PAGE_KERNEL_READ	__pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
>   #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>   #define PAGE_KERNEL_READ_EXEC	__pgprot((_PAGE_KERNEL & ~_PAGE_WRITE) \
Palmer Dabbelt Jan. 9, 2021, 10:19 p.m. UTC | #4
On Mon, 14 Dec 2020 03:30:19 PST (-0800), wangkefeng.wang@huawei.com wrote:
> Hi Palmer,  kindly ping..
>
> On 2020/11/11 19:52, Kefeng Wang wrote:
>> commit b91540d52a08 ("RISC-V: Add EFI runtime services") add
>> a duplicated PAGE_KERNEL_EXEC, kill it.
>>
>> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
>> ---
>>   arch/riscv/include/asm/pgtable.h | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
>> index 183f1f4b2ae6..73e8b5e5bb65 100644
>> --- a/arch/riscv/include/asm/pgtable.h
>> +++ b/arch/riscv/include/asm/pgtable.h
>> @@ -99,7 +99,6 @@
>>   				| _PAGE_DIRTY)
>>
>>   #define PAGE_KERNEL		__pgprot(_PAGE_KERNEL)
>> -#define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>>   #define PAGE_KERNEL_READ	__pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
>>   #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL | _PAGE_EXEC)
>>   #define PAGE_KERNEL_READ_EXEC	__pgprot((_PAGE_KERNEL & ~_PAGE_WRITE) \

Thanks, this is on fixes.
diff mbox series

Patch

diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 183f1f4b2ae6..73e8b5e5bb65 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -99,7 +99,6 @@ 
 				| _PAGE_DIRTY)
 
 #define PAGE_KERNEL		__pgprot(_PAGE_KERNEL)
-#define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL | _PAGE_EXEC)
 #define PAGE_KERNEL_READ	__pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
 #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL | _PAGE_EXEC)
 #define PAGE_KERNEL_READ_EXEC	__pgprot((_PAGE_KERNEL & ~_PAGE_WRITE) \