2014-04-15 01:50:04

by Chen Gang

[permalink] [raw]
Subject: [PATCH] unicore32: include: asm: add missing ')' for PAGE_* macros in pgtable.h

Missing related ')', the related compiling error:

CC [M] drivers/gpu/drm/udl/udl_fb.o
drivers/gpu/drm/udl/udl_fb.c: In function ?udl_fb_mmap?:
drivers/gpu/drm/udl/udl_fb.c:273: error: expected ?)? before ?return?
drivers/gpu/drm/udl/udl_fb.c:281: error: expected expression before ?}? token
make[4]: *** [drivers/gpu/drm/udl/udl_fb.o] Error 1
make[3]: *** [drivers/gpu/drm/udl] Error 2
make[2]: *** [drivers/gpu/drm] Error 2
make[1]: *** [drivers/gpu] Error 2
make: *** [drivers] Error 2


Signed-off-by: Chen Gang <[email protected]>
---
arch/unicore32/include/asm/pgtable.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index 233c258..ed6f7d0 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -87,16 +87,16 @@ extern pgprot_t pgprot_kernel;

#define PAGE_NONE pgprot_user
#define PAGE_SHARED __pgprot(pgprot_val(pgprot_user | PTE_READ \
- | PTE_WRITE)
+ | PTE_WRITE))
#define PAGE_SHARED_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
| PTE_WRITE \
- | PTE_EXEC)
+ | PTE_EXEC))
#define PAGE_COPY __pgprot(pgprot_val(pgprot_user | PTE_READ)
#define PAGE_COPY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
- | PTE_EXEC)
-#define PAGE_READONLY __pgprot(pgprot_val(pgprot_user | PTE_READ)
+ | PTE_EXEC))
+#define PAGE_READONLY __pgprot(pgprot_val(pgprot_user | PTE_READ))
#define PAGE_READONLY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
- | PTE_EXEC)
+ | PTE_EXEC))
#define PAGE_KERNEL pgprot_kernel
#define PAGE_KERNEL_EXEC __pgprot(pgprot_val(pgprot_kernel | PTE_EXEC))

--
1.7.9.5


2014-04-16 05:19:49

by Guan Xuetao

[permalink] [raw]
Subject: 回复： [PATCH] unicore3 2: include: asm: add missing ')' for PAGE_* macros in pgtable.h

This problem has been fixed, but I didn't submit.
Anyway, I can apply your version.

Acked-by: Xuetao Guan <[email protected]>

----- Chen Gang <[email protected]> 写道：
> Missing related ')', the related compiling error:
>
> CC [M] drivers/gpu/drm/udl/udl_fb.o
> drivers/gpu/drm/udl/udl_fb.c: In function ‘udl_fb_mmap’:
> drivers/gpu/drm/udl/udl_fb.c:273: error: expected ‘)’ before ‘return’
> drivers/gpu/drm/udl/udl_fb.c:281: error: expected expression before ‘}’ token
> make[4]: *** [drivers/gpu/drm/udl/udl_fb.o] Error 1
> make[3]: *** [drivers/gpu/drm/udl] Error 2
> make[2]: *** [drivers/gpu/drm] Error 2
> make[1]: *** [drivers/gpu] Error 2
> make: *** [drivers] Error 2
>
>
> Signed-off-by: Chen Gang <[email protected]>
> ---
> arch/unicore32/include/asm/pgtable.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
> index 233c258..ed6f7d0 100644
> --- a/arch/unicore32/include/asm/pgtable.h
> +++ b/arch/unicore32/include/asm/pgtable.h
> @@ -87,16 +87,16 @@ extern pgprot_t pgprot_kernel;
>
> #define PAGE_NONE pgprot_user
> #define PAGE_SHARED __pgprot(pgprot_val(pgprot_user | PTE_READ \
> - | PTE_WRITE)
> + | PTE_WRITE))
> #define PAGE_SHARED_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
> | PTE_WRITE \
> - | PTE_EXEC)
> + | PTE_EXEC))
> #define PAGE_COPY __pgprot(pgprot_val(pgprot_user | PTE_READ)
> #define PAGE_COPY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
> - | PTE_EXEC)
> -#define PAGE_READONLY __pgprot(pgprot_val(pgprot_user | PTE_READ)
> + | PTE_EXEC))
> +#define PAGE_READONLY __pgprot(pgprot_val(pgprot_user | PTE_READ))
> #define PAGE_READONLY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
> - | PTE_EXEC)
> + | PTE_EXEC))
> #define PAGE_KERNEL pgprot_kernel
> #define PAGE_KERNEL_EXEC __pgprot(pgprot_val(pgprot_kernel | PTE_EXEC))
>
> --
> 1.7.9.5

2014-04-16 05:44:40

by Chen Gang

[permalink] [raw]
Subject: Re: 回复： [PATCH] unicore32: include: asm: add missing ')' for PAGE_* macros in pgtab le.h

On 04/16/2014 01:19 PM, 管雪涛 wrote:
> This problem has been fixed, but I didn't submit.
> Anyway, I can apply your version.
>
> Acked-by: Xuetao Guan <[email protected]>
>

OK, thanks.

> ----- Chen Gang <[email protected]> 写道：
>> Missing related ')', the related compiling error:
>>
>> CC [M] drivers/gpu/drm/udl/udl_fb.o
>> drivers/gpu/drm/udl/udl_fb.c: In function ‘udl_fb_mmap’:
>> drivers/gpu/drm/udl/udl_fb.c:273: error: expected ‘)’ before ‘return’
>> drivers/gpu/drm/udl/udl_fb.c:281: error: expected expression before ‘}’ token
>> make[4]: *** [drivers/gpu/drm/udl/udl_fb.o] Error 1
>> make[3]: *** [drivers/gpu/drm/udl] Error 2
>> make[2]: *** [drivers/gpu/drm] Error 2
>> make[1]: *** [drivers/gpu] Error 2
>> make: *** [drivers] Error 2
>>
>>
>> Signed-off-by: Chen Gang <[email protected]>
>> ---
>> arch/unicore32/include/asm/pgtable.h | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
>> index 233c258..ed6f7d0 100644
>> --- a/arch/unicore32/include/asm/pgtable.h
>> +++ b/arch/unicore32/include/asm/pgtable.h
>> @@ -87,16 +87,16 @@ extern pgprot_t pgprot_kernel;
>>
>> #define PAGE_NONE pgprot_user
>> #define PAGE_SHARED __pgprot(pgprot_val(pgprot_user | PTE_READ \
>> - | PTE_WRITE)
>> + | PTE_WRITE))
>> #define PAGE_SHARED_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
>> | PTE_WRITE \
>> - | PTE_EXEC)
>> + | PTE_EXEC))
>> #define PAGE_COPY __pgprot(pgprot_val(pgprot_user | PTE_READ)
>> #define PAGE_COPY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
>> - | PTE_EXEC)
>> -#define PAGE_READONLY __pgprot(pgprot_val(pgprot_user | PTE_READ)
>> + | PTE_EXEC))
>> +#define PAGE_READONLY __pgprot(pgprot_val(pgprot_user | PTE_READ))
>> #define PAGE_READONLY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
>> - | PTE_EXEC)
>> + | PTE_EXEC))
>> #define PAGE_KERNEL pgprot_kernel
>> #define PAGE_KERNEL_EXEC __pgprot(pgprot_val(pgprot_kernel | PTE_EXEC))
>>
>> --
>> 1.7.9.5
>

--
Chen Gang

Open, share, and attitude like air, water, and life which God blessed