diff mbox

next: sh: Fix compile error

Message ID 1420662748-28129-1-git-send-email-linux@roeck-us.net (mailing list archive)
State Awaiting Upstream
Headers show

Commit Message

Guenter Roeck Jan. 7, 2015, 8:32 p.m. UTC
Commit a91ed664749c ("kernel: tighten rules for ACCESS ONCE") results in a
compile failure for sh builds with CONFIG_X2TLB enabled.

arch/sh/mm/gup.c: In function 'gup_get_pte':
arch/sh/mm/gup.c:20:2: error: invalid initializer
make[1]: *** [arch/sh/mm/gup.o] Error 1

Replace ACCESS_ONCE with READ_ONCE to fix the problem.

Fixes: a91ed664749c ("kernel: tighten rules for ACCESS ONCE")
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
Compile tested only.

 arch/sh/mm/gup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul E. McKenney Jan. 7, 2015, 9:04 p.m. UTC | #1
On Wed, Jan 07, 2015 at 12:32:28PM -0800, Guenter Roeck wrote:
> Commit a91ed664749c ("kernel: tighten rules for ACCESS ONCE") results in a
> compile failure for sh builds with CONFIG_X2TLB enabled.
> 
> arch/sh/mm/gup.c: In function 'gup_get_pte':
> arch/sh/mm/gup.c:20:2: error: invalid initializer
> make[1]: *** [arch/sh/mm/gup.o] Error 1
> 
> Replace ACCESS_ONCE with READ_ONCE to fix the problem.
> 
> Fixes: a91ed664749c ("kernel: tighten rules for ACCESS ONCE")
> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Compile tested only.
> 
>  arch/sh/mm/gup.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/sh/mm/gup.c b/arch/sh/mm/gup.c
> index 37458f3..e113bb4 100644
> --- a/arch/sh/mm/gup.c
> +++ b/arch/sh/mm/gup.c
> @@ -17,7 +17,7 @@
>  static inline pte_t gup_get_pte(pte_t *ptep)
>  {
>  #ifndef CONFIG_X2TLB
> -	return ACCESS_ONCE(*ptep);
> +	return READ_ONCE(*ptep);
>  #else
>  	/*
>  	 * With get_user_pages_fast, we walk down the pagetables without
> -- 
> 2.1.0
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Christian Borntraeger Jan. 7, 2015, 9:08 p.m. UTC | #2
Am 07.01.2015 um 22:04 schrieb Paul E. McKenney:
> On Wed, Jan 07, 2015 at 12:32:28PM -0800, Guenter Roeck wrote:
>> Commit a91ed664749c ("kernel: tighten rules for ACCESS ONCE") results in a
>> compile failure for sh builds with CONFIG_X2TLB enabled.
>>
>> arch/sh/mm/gup.c: In function 'gup_get_pte':
>> arch/sh/mm/gup.c:20:2: error: invalid initializer
>> make[1]: *** [arch/sh/mm/gup.o] Error 1
>>
>> Replace ACCESS_ONCE with READ_ONCE to fix the problem.
>>
>> Fixes: a91ed664749c ("kernel: tighten rules for ACCESS ONCE")
>> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> 
> Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Applied to my tree, thanks.

Christian

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/sh/mm/gup.c b/arch/sh/mm/gup.c
index 37458f3..e113bb4 100644
--- a/arch/sh/mm/gup.c
+++ b/arch/sh/mm/gup.c
@@ -17,7 +17,7 @@ 
 static inline pte_t gup_get_pte(pte_t *ptep)
 {
 #ifndef CONFIG_X2TLB
-	return ACCESS_ONCE(*ptep);
+	return READ_ONCE(*ptep);
 #else
 	/*
 	 * With get_user_pages_fast, we walk down the pagetables without